log mercurial/filemerge.py @ 15264:157d93c41c10

age author description
Wed, 12 Oct 2011 21:45:58 -0400 Greg Ward merge: expand environment variables and ~/ in tool.executable
Fri, 24 Jun 2011 17:04:37 +0300 Idan Kamara filemerge: use ui out descriptor when calling util.system stable
Sun, 08 May 2011 20:35:46 +0200 Adrian Buehlmann rename util.find_exe to findexe
Fri, 06 May 2011 15:16:22 +0200 Adrian Buehlmann rename util.lookup_reg to lookupreg
Mon, 02 May 2011 10:11:18 +0200 Dan Villiom Podlaski Christiansen prevent transient leaks of file handle by using new helper functions
Tue, 08 Mar 2011 13:05:18 -0600 Steve Borho filemerge: introduce a 'regkeyalt' merge tool variable stable
Tue, 19 Oct 2010 22:33:52 -0500 Steve Borho merge: implement --tool arguments using new ui.forcemerge configurable