Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-addremove.out @ 1700:e2f91e0acbb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgmerge: add cleanup functions This patch adds functions cleanup, success and failure. The last two of these should be used instead of exit. Current code was changed to use them. It also moves $HGTMP to the top of the file (it's used in the cleanup function), changes the comment and removes now unneeded trap in the diff+patch merge.
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Mon, 06 Feb 2006 17:32:06 -0600
parents eef8ff46567a
children 4e35843b2683
line wrap: on
line source

adding dir/bar
adding foo
dir/bar
foo
adding dir/bar_2
adding foo_2
dir/bar_2
foo_2