Mercurial > public > mercurial-scm > hg
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 |
Sat, 19 Nov 2016 15:41:37 -0800 | Kostia Balytskyi | conflicts: make spacing consistent in conflict markers |
Thu, 10 Nov 2016 16:33:07 -0500 | Augie Fackler | filemerge: avoid shadowing a variable in a list comprehension |