Mercurial > public > mercurial-scm > hg
log mercurial/filemerge.py @ 30924:48dea083f66d
age | author | description |
---|---|---|
Mon, 13 Feb 2017 20:06:38 +0530 | Pulkit Goyal | py3: convert the mode argument of os.fdopen to unicodes (1 of 2) |
Thu, 09 Feb 2017 09:32:25 -0800 | Martin von Zweigbergk | merge: print status message before launching external merge tool |
Sun, 18 Dec 2016 01:54:36 +0530 | Pulkit Goyal | py3: replace os.environ with encoding.environ (part 3 of 5) |
Wed, 23 Nov 2016 23:47:38 +0100 | Mads Kiilerich | merge: use original file extension for temporary files |