Mercurial > hg
comparison tests/test-merge-prompt.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 | 117f9190c1ba |
| children | c8ba98bf0e71 |
comparison
equal
deleted
inserted
replaced
| 18331:e68cec5e28b0 | 18332:6ba58ab719e5 |
|---|