Mercurial > hg

annotate tests/test-1102.out @ 8744:6b675c781c6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify 'other deleted' case
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 938eddd76237
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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