Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 5318:c6682cdada2f
Test renaming files brought by merge second parent (issue 746)
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 23 Sep 2007 14:40:44 +0200 |
parents | ad6b97132b81 |
children | 4ed58fe4fe13 f9b0e4f023c4 |
comparison
equal
deleted
inserted
replaced
5317:ef65d6ec114e | 5318:c6682cdada2f |
---|