comparison tests/test-mq-qimport-fail-cleanup.t @ 18332:6ba58ab719e5

merge: .hgsubstate is special as merge destination, not as merge source
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 01:05:12 +0100
parents f2719b387380
children 0342bf292f73
comparison
equal deleted inserted replaced
18331:e68cec5e28b0 18332:6ba58ab719e5