Mercurial > hg

annotate tests/test-merge3.out @ 5080:73fdc8bd3ed8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update on pull -u when heads were closed (fixes issue666). Patch written by Benoit Boissinot. This should probably be improved in the future to handle long-living branches, as joining two "other" heads will switch to that new head. But this is not a new problem, as adding to the "other" head would have switched to that new head, too.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 06 Aug 2007 20:25:50 +0200
parents 91c56c427171
children
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 removing b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 775
diff changeset
2 nothing changed