Mercurial > hg > merge-bug

changeset 0:85a0b6462b26 draft v1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
init v1
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Wed, 02 Jul 2014 16:24:33 -0400
parents
children 7c0053440a51 607360a4d852
files lolomgwtf.txt
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/lolomgwtf.txt
@@ -0,0 +1,3 @@
+This is the 1.0 branch
+This line appears in both
+This line should only appear in 1.0