Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge5.out @ 4940:71fed370b7a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backout ad09ce1d393c and replace ''' with """ to make some highlighting happy. I have tried Debian's default emacs and the current CVS version. Default emacs doesn't have highlighting enabled (and being emacs-illiterate I don't know how to enable it) and the CVS emacs' Python highlighting has no problems with ' characters here.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 21 Jul 2007 10:36:51 +0200
parents fffc8a733bf9
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2038
diff changeset
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
2 removing b
3592
fffc8a733bf9 Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3580
diff changeset
3 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes