tests/test-1102.out
author Matt Mackall <mpm@selenic.com>
Mon, 08 Jun 2009 18:14:44 -0500
changeset 8733 f8be48c6b08c
parent 6671 938eddd76237
permissions -rw-r--r--
merge: simplify flag merging code slightly
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6671
938eddd76237 tag: record tag we're superseding, if any (issue 1102)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     1
adding a
938eddd76237 tag: record tag we're superseding, if any (issue 1102)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
938eddd76237 tag: record tag we're superseding, if any (issue 1102)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     3
tip                                3:a49829c4fc11
938eddd76237 tag: record tag we're superseding, if any (issue 1102)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     4
t1                                 0:f7b1eb17ad24