Mercurial > hg > merge-bug

view lolomgwtf.txt @ 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
line wrap: on
line source

This is the 2.0 branch
This line appears in both
This line should only appear in 2.0