Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge3.out @ 801:1f9ec150a476
Updated output of tests.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 15:21:02 +0100 |
parents | 122449dd89db |
children | 8f5637f0a0c0 |
comparison
equal
deleted
inserted
replaced
800:ec85f9e6f3b1 | 801:1f9ec150a476 |
---|---|
1 + hg init | 1 + hg init |
2 + echo This is file a1 | |
3 + hg add a | 2 + hg add a |
4 + hg commit -m 'commit #0' -d '0 0' | 3 + hg commit -m commit #0 -d 0 0 |
5 + touch b | |
6 + hg add b | 4 + hg add b |
7 + rm b | 5 + hg commit -A -mcomment #1 -d 0 0 |
8 + hg commit -A '-mcomment #1' -d '0 0' | |
9 adding .out | |
10 removing b | 6 removing b |
11 b never committed! | 7 b never committed! |
8 nothing changed |