Mercurial > hg
comparison tests/test-merge-prompt.t @ 12383:f1e8d6f6e682
merge with stable
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Thu, 23 Sep 2010 01:59:02 +0200 |
| parents | 22f3353bcc36 |
| children | 117f9190c1ba |
comparison
equal
deleted
inserted
replaced
| 12380:1e2625fe371b | 12383:f1e8d6f6e682 |
|---|