Mercurial > hg > gitweb
diff tests/test-merge3.out @ 808:8f5637f0a0c0
Merge with TAH
author | mpm@selenic.com |
---|---|
date | Sat, 30 Jul 2005 08:35:29 -0800 |
parents | 122449dd89db 1f9ec150a476 |
children | 0902ffece4b4 |
line wrap: on
line diff
--- a/tests/test-merge3.out Sat Jul 30 08:30:12 2005 -0800 +++ b/tests/test-merge3.out Sat Jul 30 08:35:29 2005 -0800 @@ -1,11 +1,8 @@ + hg init -+ echo This is file a1 + hg add a -+ hg commit -m 'commit #0' -d '0 0' -+ touch b ++ hg commit -m commit #0 -d 0 0 + hg add b -+ rm b -+ hg commit -A '-mcomment #1' -d '0 0' -adding .out ++ hg commit -A -mcomment #1 -d 0 0 removing b b never committed! +nothing changed