diff tests/test-bheads.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 701df761aa94
line wrap: on
line diff