Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge5.out @ 2090:eb40db373717
fix util.canonpath on windows.
old test for absolute path was not portable. use os.path api instead.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Wed, 19 Apr 2006 09:08:45 -0700 |
parents | 5c4496ed152d |
children | b2ae81a7df29 |
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 |
415
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
2 this update spans a branch affecting the following files: |
616 | 3 b |
415
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
4 aborting update spanning branches! |
2038
5c4496ed152d
Tell the user the real "hg update -C" command, not just "-C" when aborting.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
5 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes) |