Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-hup.out @ 768:20e95c245bc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix local file changes being ignored after non-branch merge Bug introduced in eea96285cbf9 Spotted by TAH
author mpm@selenic.com
date Sat, 23 Jul 2005 10:00:56 -0500
parents 5d6177b72fcc
children 46a8dd3145cc 445970ccf57a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
642
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 0
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2 0
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 adding changesets
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 killed!
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
5 transaction abort!
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
6 rollback completed
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
7 00changelog.d
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
8 00changelog.i
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
9 data
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
10 undo.dirstate