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