log tests/failfilemerge.py @ 28396:5490b04e6132

age author description
Fri, 05 Feb 2016 01:56:46 +0000 timeless rebase: update working directory when aborting (issue5084) stable