log mercurial/merge.py @ 30887:a95fc01aaffe

age author description
Wed, 01 Feb 2017 02:10:30 +0100 Mads Kiilerich merge: more safe detection of criss cross merge conflict between dm and r stable