Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge2.out @ 1636:7da32bb3d1d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib: add Chris Mason's stand-alone diff tool This uses Mercurial's diff algorithm to generate unidiffs like the traditional diff tool.
author Matt Mackall <mpm@selenic.com>
date Tue, 24 Jan 2006 14:49:19 +1300
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
1 adding b
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
2 adding b