| Sun, 23 Mar 2008 20:37:02 +0100 |
Patrick Mezard |
imerge: replace "merge" with "internal:merge" when non-interactive
|
file |
diff |
annotate
|
| Tue, 11 Mar 2008 17:42:29 -0500 |
Matt Mackall |
revlog: report node and file when lookup fails
|
file |
diff |
annotate
|
| Thu, 06 Mar 2008 22:23:41 +0100 |
Joel Rosdahl |
imerge: Fix unbound name error and add a test case
|
file |
diff |
annotate
|
| Thu, 06 Mar 2008 22:23:26 +0100 |
Joel Rosdahl |
Expand import * to allow Pyflakes to find problems
|
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
|
| Thu, 23 Aug 2007 22:45:41 -0700 |
Brendan Cully |
imerge: add automerge flag to attempt to batch merge all conflicts
|
file |
diff |
annotate
|
| Thu, 23 Aug 2007 19:51:59 -0700 |
Brendan Cully |
imerge: fix ancestor calculation
|
file |
diff |
annotate
|
| Mon, 13 Aug 2007 11:58:47 -0700 |
Brendan Cully |
imerge: simplify 1d5ebb0d366f
|
file |
diff |
annotate
|
| Mon, 13 Aug 2007 19:42:52 +0200 |
Patrick Mezard |
imerge: fix status file lookups
|
file |
diff |
annotate
|
| Tue, 07 Aug 2007 10:28:43 +0200 |
Thomas Arendsen Hein |
Remove trailing spaces, fix indentation
|
file |
diff |
annotate
|
| Sat, 04 Aug 2007 12:26:48 -0700 |
Brendan Cully |
imerge: gussy up dispatcher to support subcommand opts.
|
file |
diff |
annotate
|
| Sat, 04 Aug 2007 09:33:10 -0700 |
Brendan Cully |
Merge with crew
|
file |
diff |
annotate
|
| Fri, 03 Aug 2007 18:05:20 -0700 |
Brendan Cully |
imerge: handle renames
|
file |
diff |
annotate
|
| Thu, 02 Aug 2007 14:04:51 +0200 |
Thomas Arendsen Hein |
imerge: sorted() is only available in python2.4 and above
|
file |
diff |
annotate
|
| Thu, 02 Aug 2007 14:04:00 +0200 |
Benoit Boissinot |
imerge: tarfile.extractall is only available in python2.5
|
file |
diff |
annotate
|
| Wed, 01 Aug 2007 23:59:19 -0700 |
Brendan Cully |
Update imerge for new filemerge interface
|
file |
diff |
annotate
|
| Wed, 01 Aug 2007 11:37:11 -0700 |
Brendan Cully |
imerge extension and test
|
file |
diff |
annotate
|