Mercurial > hg > mercurial-crew-with-dirclash

view 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
line wrap: on
line source

0
0
adding changesets
killed!
transaction abort!
rollback completed
00changelog.d
00changelog.i
data
undo.dirstate