Mercurial > hg
diff tests/test-issue1306.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 | 41885892796e |
children | 2fc86d92c4a9 |