Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 4918:bcba70b8006d
Better fix for issue 622 than we had in c4dd58af0fc8.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Wed, 18 Jul 2007 13:56:08 -0700 |
| parents | 931f901ab811 |
| children | 6fd953d5faea 60c54154ec4c |
comparison
equal
deleted
inserted
replaced
| 4917:7d745e9d2cf0 | 4918:bcba70b8006d |
|---|