tests/test-hup.out
author mpm@selenic.com
Sat, 23 Jul 2005 10:00:56 -0500
changeset 768 20e95c245bc3
parent 642 5d6177b72fcc
child 785 46a8dd3145cc
child 793 445970ccf57a
permissions -rw-r--r--
Fix local file changes being ignored after non-branch merge Bug introduced in eea96285cbf9 Spotted by TAH

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