author | Thomas Arendsen Hein <thomas@intevation.de> |
Sat, 01 Apr 2006 19:11:59 +0200 | |
changeset 2031 | d242719c716e |
parent 2019 | ced2d3620f95 |
child 2038 | 5c4496ed152d |
permissions | -rw-r--r-- |
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! |
2019
ced2d3620f95
add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
925
diff
changeset
|
5 |
(use 'hg merge' to merge across branches or '-C' to lose changes) |