Mercurial > hg
diff tests/test-merge3.out @ 749:7e4843b7efd2
Update tests to use commit -m and default -u
manifest hash: 6e4385453843031a712005a320d6000595b40d05
author | mpm@selenic.com |
---|---|
date | Thu, 21 Jul 2005 15:05:17 -0500 |
parents | 2fe8d66e3075 |
children | 61ed30e82b27 |
line wrap: on
line diff
--- a/tests/test-merge3.out Thu Jul 21 12:40:28 2005 -0500 +++ b/tests/test-merge3.out Thu Jul 21 15:05:17 2005 -0500 @@ -1,9 +1,9 @@ + hg init + echo This is file a1 + hg add a -+ hg commit -t 'commit #0' -d '0 0' -u user ++ hg commit -m 'commit #0' -d '0 0' + touch b + hg add b + rm b -+ hg commit -A '-tcomment #1' -d '0 0' -u user ++ hg commit -A '-mcomment #1' -d '0 0' b never committed!