tests/test-tags.out
changeset 2175 b2ae81a7df29
parent 1986 719cf07b076d
child 2320 dbdce3b99988
--- a/tests/test-tags.out	Mon May 01 19:17:34 2006 +0200
+++ b/tests/test-tags.out	Tue May 02 18:44:02 2006 +0200
@@ -1,4 +1,5 @@
 unknown
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0acdaf898367 tip
 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 first
 tip                                1:8a3ca90d111dc784e6575d373105be12570e8776
@@ -6,10 +7,13 @@
 8a3ca90d111d tip
 M a
 8a3ca90d111d+ tip
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 0acdaf898367+ first
 0acdaf8983679e0aac16e811534eb49d7ee1f2b4+ first
 M a
 8216907a933d tip
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
 8216907a933d+8a3ca90d111d+ tip
 M .hgtags
 .hgtags:2: ignoring invalid tag