Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge3.out @ 775:122449dd89db
Fix up test results
No more errnos
diff | sed changes
.out message ok
author | mpm@selenic.com |
---|---|
date | Tue, 26 Jul 2005 19:23:59 -0800 |
parents | 61ed30e82b27 |
children | 1f9ec150a476 8f5637f0a0c0 0902ffece4b4 |
comparison
equal
deleted
inserted
replaced
774:6592c4f5cd4f | 775:122449dd89db |
---|---|
4 + hg commit -m 'commit #0' -d '0 0' | 4 + hg commit -m 'commit #0' -d '0 0' |
5 + touch b | 5 + touch b |
6 + hg add b | 6 + hg add b |
7 + rm b | 7 + rm b |
8 + hg commit -A '-mcomment #1' -d '0 0' | 8 + hg commit -A '-mcomment #1' -d '0 0' |
9 adding .out | |
9 removing b | 10 removing b |
10 b never committed! | 11 b never committed! |