Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-addremove.out @ 1883:b98160cfb2f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
give more info to hgmerge script.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 10 Mar 2006 23:34:02 -0800
parents eef8ff46567a
children 4e35843b2683
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1623
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
1 adding dir/bar
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
2 adding foo
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
3 dir/bar
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
4 foo
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
5 adding dir/bar_2
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
6 adding foo_2
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
7 dir/bar_2
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
8 foo_2