view tests/test-abort-checkin.out @ 3295:764688cf51e5

merge: remember rename copies and parents properly on commit record copies in dirstate even if rename was remote this lets us record it properly at commit teach checkfilemerge about copies, including merge cases pull old copy code out of commit extend rename-merge1 test to show file index
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Oct 2006 19:57:45 -0500
parents 6bd351194a96
children 193e0f8d9a47
line wrap: on
line source

abort: edit failed: false exited with status 1
transaction abort!
rollback completed
abort: edit failed: false exited with status 1
transaction abort!
rollback completed