Mercurial > hg > merge-bug

changeset 2:6877e1d41e87 draft v3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branch off v3
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Wed, 02 Jul 2014 16:26:51 -0400
parents 7c0053440a51
children
files lolomgwtf.txt
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lolomgwtf.txt
+++ b/lolomgwtf.txt
@@ -1,3 +1,2 @@
-This is the 2.0 branch
-This line appears in both
-This line should only appear in 2.0
+This is the 3.0 branch
+It has no lines in common with the previous branches