Mercurial > public > mercurial-scm > hg
log mercurial/filemerge.py @ 31495:d1937bdcee8c
age | author | description |
---|---|---|
Wed, 15 Mar 2017 15:11:52 -0700 | Pierre-Yves David | filemerge: explicitly tests for None |
Mon, 26 Dec 2016 16:54:33 -0700 | Gregory Szorc | filemerge: don't use mutable default argument value |
Mon, 06 Mar 2017 03:19:40 -0800 | Simon Farnsworth | filemerge: tag merge tool for blocked times |
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 |