Mercurial > public > mercurial-scm > hg-stable
diff contrib/editmerge @ 20615:b96cb15ec9e0 stable 2.9.1
merge: audit the right destination file when merging with dir rename
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Sat, 01 Mar 2014 18:09:39 +0100 |
parents | 34d720b3b33e |
children | 864c56cb8945 |