author | mpm@selenic.com |
Wed, 17 Aug 2005 12:26:06 -0800 | |
changeset 936 | b62d1e738fa9 |
parent 925 | 5a034646e472 |
child 2019 | ced2d3620f95 |
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! |
819
77e121a0d870
Update output for test-merge5.
Bryan O'Sullivan <bos@serpentine.com>
parents:
814
diff
changeset
|
5 |
(use update -m to merge across branches or -C to lose changes) |