tests/test-1102.out
author Patrick Mezard <pmezard@gmail.com>
Mon, 13 Apr 2009 21:21:01 +0200
changeset 8064 5c7bc1aece9e
parent 6671 938eddd76237
permissions -rw-r--r--
extdiff: merge node and working dir snapshot modes
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