| Sun, 13 Apr 2008 11:31:45 -0500 |
Matt Mackall |
Merge with -stable
|
file |
diff |
annotate
|
| Fri, 04 Apr 2008 02:21:53 +0300 |
Dov Feldstern |
use internal merge tool when specified for a merge-pattern in hgrc
|
file |
diff |
annotate
|
| Thu, 10 Apr 2008 15:02:24 -0500 |
Matt Mackall |
merge: introduce mergestate
|
file |
diff |
annotate
|
| Thu, 06 Mar 2008 22:23:41 +0100 |
Joel Rosdahl |
Remove unused imports
|
file |
diff |
annotate
|
| Thu, 06 Mar 2008 22:23:26 +0100 |
Joel Rosdahl |
Expand import * to allow Pyflakes to find problems
|
file |
diff |
annotate
|
| Wed, 06 Feb 2008 20:44:25 -0600 |
Steve Borho |
filemerge: more backwards compatible behavior for ui.merge
|
file |
diff |
annotate
|
| Wed, 06 Feb 2008 20:32:06 -0600 |
Steve Borho |
filemerge: add 'checkchanged' merge tool property
|
file |
diff |
annotate
|
| Mon, 04 Feb 2008 19:38:34 -0600 |
Steve Borho |
filemerge: wrap quotes around tool path
|
file |
diff |
annotate
|
| Mon, 04 Feb 2008 09:56:01 -0600 |
dhruva |
filemerge: fix pattern matching
|
file |
diff |
annotate
|
| Sun, 03 Feb 2008 23:58:02 -0800 |
Lee Cantey |
filemerge: fix path to working file when fixeol is enabled
|
file |
diff |
annotate
|
| Mon, 04 Feb 2008 09:51:56 -0600 |
Matt Mackall |
filemerge: handle missing regappend
|
file |
diff |
annotate
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
filemerge: add config item for GUI tools
|
file |
diff |
annotate
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
merge: add registry look up bits to tool search
|
file |
diff |
annotate
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
merge: add support for tool EOL fixups
|
file |
diff |
annotate
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
merge: allow smarter tool configuration
|
file |
diff |
annotate
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
filemerge: pull file-merging code into its own module
|
file |
diff |
annotate
|