Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-hook.out @ 2178:00205fe76993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 02 May 2006 14:38:32 -0700
parents b2ae81a7df29
children 3f7692b0ff13
line wrap: on
line diff
--- a/tests/test-hook.out
+++ b/tests/test-hook.out
@@ -3,16 +3,20 @@ pretxncommit hook: n=29b62aeb769fdf78d8d
 0:29b62aeb769f
 commit hook: n=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p1=0000000000000000000000000000000000000000 p2=
 commit hook b
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 precommit hook: p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
 pretxncommit hook: n=b702efe9688826e3a91283852b328b84dbf37bc2 p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
 1:b702efe96888
 commit hook: n=b702efe9688826e3a91283852b328b84dbf37bc2 p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
 commit hook b
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 precommit hook: p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
 pretxncommit hook: n=1324a5531bac09b329c3845d35ae6a7526874edb p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
 2:1324a5531bac
 commit hook: n=1324a5531bac09b329c3845d35ae6a7526874edb p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
 commit hook b
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
 precommit hook: p1=1324a5531bac09b329c3845d35ae6a7526874edb p2=b702efe9688826e3a91283852b328b84dbf37bc2
 pretxncommit hook: n=4c52fb2e402287dd5dc052090682536c8406c321 p1=1324a5531bac09b329c3845d35ae6a7526874edb p2=b702efe9688826e3a91283852b328b84dbf37bc2
 3:4c52fb2e4022