log mercurial/filemerge.py @ 30538:c2154979409d

age author description
Wed, 23 Nov 2016 23:47:38 +0100 Mads Kiilerich merge: use original file extension for temporary files