log mercurial/merge.py @ 20615:b96cb15ec9e0 stable 2.9.1

age author description
Sat, 01 Mar 2014 18:09:39 +0100 Mads Kiilerich merge: audit the right destination file when merging with dir rename stable 2.9.1