Mercurial > hg > merge-bug

changeset 3:607360a4d852 draft v1 tip

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