Mercurial > hg > merge-bug

comparison lolomgwtf.txt @ 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
comparison
equal deleted inserted replaced
1:7c0053440a51 2:6877e1d41e87
1 This is the 2.0 branch 1 This is the 3.0 branch
2 This line appears in both 2 It has no lines in common with the previous branches
3 This line should only appear in 2.0