Mercurial > hg
comparison mercurial/filemerge.py @ 16792:ad394c897b16
merge: do not warn about copy and rename in the same transaction (issue2113)
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 23 May 2012 17:25:48 +0200 |
| parents | c655e4acaa82 |
| children | 9a2cf955db84 |
comparison
equal
deleted
inserted
replaced
| 16778:2ac08d8b21aa | 16792:ad394c897b16 |
|---|