Mercurial > public > mercurial-scm > hg
log mercurial/filemerge.py @ 6211:f89fd07fc51d
age | author | description |
---|---|---|
Thu, 06 Mar 2008 22:23:26 +0100 | Joel Rosdahl | Expand import * to allow Pyflakes to find problems |
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 |