Mercurial > hg > merge-bug

changeset 1:7c0053440a51 draft v2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branch off v2
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Wed, 02 Jul 2014 16:26:31 -0400
parents 85a0b6462b26
children 6877e1d41e87
files lolomgwtf.txt
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lolomgwtf.txt
+++ b/lolomgwtf.txt
@@ -1,3 +1,3 @@
-This is the 1.0 branch
+This is the 2.0 branch
 This line appears in both
-This line should only appear in 1.0
+This line should only appear in 2.0