Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge3.out @ 768:20e95c245bc3
Fix local file changes being ignored after non-branch merge
Bug introduced in eea96285cbf9
Spotted by TAH
author | mpm@selenic.com |
---|---|
date | Sat, 23 Jul 2005 10:00:56 -0500 |
parents | 61ed30e82b27 |
children | 122449dd89db |
rev | line source |
---|---|
402 | 1 + hg init |
2 + echo This is file a1 | |
3 + hg add a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
402
diff
changeset
|
4 + hg commit -m 'commit #0' -d '0 0' |
402 | 5 + touch b |
6 + hg add b | |
7 + rm b | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
402
diff
changeset
|
8 + hg commit -A '-mcomment #1' -d '0 0' |
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
9 removing b |
402 | 10 b never committed! |