Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 2811:4f7abf341cd4
fetch: fix breakage from mpm.
add test so will not break again.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Tue, 08 Aug 2006 16:09:26 -0700 |
| parents | 987c31e2a08c |
| children | ca06d35af65e |
comparison
equal
deleted
inserted
replaced
| 2810:2e4ace008c94 | 2811:4f7abf341cd4 |
|---|