Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-double-merge.out @ 5285:3ef190234b55
record: change wording of initial per-file prompt
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Thu, 06 Sep 2007 10:52:54 -0700 |
| parents | f191bc3916f7 |
| children | 17ed9b9a0d03 |
comparison
equal
deleted
inserted
replaced
| 5284:f8c36b215281 | 5285:3ef190234b55 |
|---|