Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-mq-merge.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 a210b40d0860
children
line wrap: on
line source

adding a
adding b
copy .hg/patches to .hg/patches.1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
M b
a
b
merging with queue at: .hg/patches.1
applying rm_a
Now at: rm_a
b
Patch queue now empty