log mercurial/filemerge.py @ 6139:989467e8e3a9

age author description
Wed, 06 Feb 2008 20:44:25 -0600 Steve Borho filemerge: more backwards compatible behavior for ui.merge
Wed, 06 Feb 2008 20:32:06 -0600 Steve Borho filemerge: add 'checkchanged' merge tool property
Mon, 04 Feb 2008 19:38:34 -0600 Steve Borho filemerge: wrap quotes around tool path
Mon, 04 Feb 2008 09:56:01 -0600 dhruva filemerge: fix pattern matching
Sun, 03 Feb 2008 23:58:02 -0800 Lee Cantey filemerge: fix path to working file when fixeol is enabled
Mon, 04 Feb 2008 09:51:56 -0600 Matt Mackall filemerge: handle missing regappend
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall filemerge: add config item for GUI tools
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: add registry look up bits to tool search
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: add support for tool EOL fixups
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: allow smarter tool configuration
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall filemerge: pull file-merging code into its own module