tests/test-abort-checkin.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 22 Jun 2007 20:44:40 -0300
changeset 4681 dc5920ea12f8
parent 4140 193e0f8d9a47
child 4960 5c5d23d93447
permissions -rw-r--r--
merge: fix small bug with a failed merge across a rename If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy f to fd, and util.set_exec wouldn't find the file.

error: pretxncommit.nocommits hook failed: no commits allowed
abort: no commits allowed
transaction abort!
rollback completed
error: pretxncommit.nocommits hook failed: no commits allowed
abort: no commits allowed
transaction abort!
rollback completed