| Sat, 02 Jan 2016 03:02:57 -0800 |
Siddharth Agarwal |
origpath: move from cmdutil to scmutil
|
file |
diff |
annotate
|
| Wed, 23 Dec 2015 12:51:45 -0800 |
Siddharth Agarwal |
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
|
file |
diff |
annotate
|
| Tue, 01 Dec 2015 09:48:38 -0800 |
Siddharth Agarwal |
filemerge: default regular prompts to 'leave unresolved' (BC)
|
file |
diff |
annotate
|
| Mon, 30 Nov 2015 13:43:55 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to change/delete prompts
|
file |
diff |
annotate
|
| Mon, 30 Nov 2015 11:17:18 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to regular prompts
|
file |
diff |
annotate
|
| Wed, 25 Nov 2015 14:25:26 -0800 |
Siddharth Agarwal |
filemerge: add debug output for whether this is a change/delete conflict
|
file |
diff |
annotate
|
| Tue, 24 Nov 2015 10:58:35 -0800 |
Siddharth Agarwal |
filemerge: in ':prompt', use ':fail' tool rather than returning directly
|
file |
diff |
annotate
|
| Tue, 24 Nov 2015 10:57:01 -0800 |
Siddharth Agarwal |
filemerge: in ':fail' tool, write out other side if local side is deleted
|
file |
diff |
annotate
|
| Sat, 14 Nov 2015 00:00:46 -0800 |
Siddharth Agarwal |
filemerge: don't try to copy files known to be absent
|
file |
diff |
annotate
|
| Fri, 13 Nov 2015 23:57:43 -0800 |
Siddharth Agarwal |
filemerge: don't try using external tools on change/delete conflicts
|
file |
diff |
annotate
|
| Fri, 13 Nov 2015 23:56:00 -0800 |
Siddharth Agarwal |
filemerge: don't attempt to premerge change/delete conflicts
|
file |
diff |
annotate
|
| Fri, 13 Nov 2015 23:58:05 -0800 |
Siddharth Agarwal |
filemerge._mergecheck: add check for change/delete conflicts
|
file |
diff |
annotate
|
| Sun, 15 Nov 2015 21:40:15 -0800 |
Siddharth Agarwal |
filemerge._picktool: only pick from nomerge tools for change/delete conflicts
|
file |
diff |
annotate
|
| Fri, 13 Nov 2015 23:52:26 -0800 |
Siddharth Agarwal |
filemerge: add support for change/delete conflicts to the ':prompt' tool
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 15:41:50 -0800 |
Siddharth Agarwal |
filemerge: add support for change/delete conflicts to the ':other' merge tool
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 15:40:28 -0800 |
Siddharth Agarwal |
filemerge: add support for change/delete conflicts to the ':local' merge tool
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 14:22:52 -0800 |
Siddharth Agarwal |
filemerge: return whether the file was deleted
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 13:55:31 -0800 |
Siddharth Agarwal |
filemerge: return whether the file is deleted from all other merge tools
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 13:52:28 -0800 |
Siddharth Agarwal |
filemerge: return whether the file is deleted for nomerge internal tools
|
file |
diff |
annotate
|
| Mon, 16 Nov 2015 11:45:35 -0800 |
Siddharth Agarwal |
filemerge: introduce class whose objects represent files not in a context
|
file |
diff |
annotate
|
| Wed, 11 Nov 2015 10:19:11 -0800 |
Martin von Zweigbergk |
filemerge: remove leading space from " no tool found..."
|
file |
diff |
annotate
|
| Wed, 11 Nov 2015 17:34:28 -0800 |
Siddharth Agarwal |
filemerge: rename _symlinkcheck to _mergecheck
|
file |
diff |
annotate
|
| Tue, 10 Nov 2015 16:25:59 -0800 |
Christian Delahousse |
filemerge: choose where .orig files are kept
|
file |
diff |
annotate
|
| Tue, 10 Nov 2015 17:13:16 -0800 |
Siddharth Agarwal |
filemerge: treat EOF at prompt as fail, not abort
|
file |
diff |
annotate
|
| Sun, 08 Nov 2015 23:42:44 -0800 |
Siddharth Agarwal |
filemerge: move :merge-local/other symlink check to precheck
|
file |
diff |
annotate
|
| Mon, 02 Nov 2015 12:12:24 -0800 |
Siddharth Agarwal |
filemerge.prompt: separate out choice selection and action
|
file |
diff |
annotate
|
| Wed, 14 Oct 2015 12:57:33 -0400 |
Augie Fackler |
merge-tools: allow marking a mergetool as completely disabled
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 15:04:00 -0700 |
Siddharth Agarwal |
filemerge: clean up some dead code
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 20:47:14 -0700 |
Siddharth Agarwal |
filemerge: break overall filemerge into separate premerge and merge steps
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 20:04:40 -0700 |
Siddharth Agarwal |
filemerge: only copy to backup during premerge step
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 20:02:53 -0700 |
Siddharth Agarwal |
filemerge: only print out "merging f" output at premerge step
|
file |
diff |
annotate
|
| Thu, 08 Oct 2015 00:19:20 -0700 |
Siddharth Agarwal |
filemerge: deindent the parts of filemerge outside the try block
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 20:47:04 -0700 |
Siddharth Agarwal |
filemerge: introduce a premerge flag and function
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 12:56:21 -0700 |
Siddharth Agarwal |
filemerge: also return whether the merge is complete
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 12:31:08 -0700 |
Siddharth Agarwal |
filemerge: add a wrapper around the filemerge function
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 21:51:24 -0700 |
Siddharth Agarwal |
filemerge: clean up temp files in a finally block
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 23:35:30 -0700 |
Siddharth Agarwal |
filemerge: move post-merge checks into a separate function
|
file |
diff |
annotate
|
| Thu, 08 Oct 2015 14:18:43 -0700 |
Siddharth Agarwal |
filemerge._xmerge: drop no longer necessary 'if r:' check
|
file |
diff |
annotate
|
| Thu, 08 Oct 2015 14:17:31 -0700 |
Siddharth Agarwal |
filemerge._idump: drop no longer necessary 'if r:' check
|
file |
diff |
annotate
|
| Thu, 08 Oct 2015 14:16:19 -0700 |
Siddharth Agarwal |
filemerge._merge: drop no longer necessary 'if r:' check
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 21:22:16 -0700 |
Siddharth Agarwal |
filemerge: call premerge directly from main merge function
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 21:28:43 -0700 |
Siddharth Agarwal |
filemerge: move precheck to before files are written out
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 22:58:52 -0700 |
Siddharth Agarwal |
filemerge: move 'merging' output to before file creation
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 21:21:56 -0700 |
Siddharth Agarwal |
filemerge.filemerge: make a tuple containing merge paths on disk
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 16:14:57 -0700 |
Siddharth Agarwal |
filemerge: switch trymerge boolean to mergetype enum
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 15:13:41 -0700 |
Siddharth Agarwal |
filemerge: add some merge types
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 00:27:23 -0700 |
Siddharth Agarwal |
filemerge: run symlink check for :merge3
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 00:24:44 -0700 |
Siddharth Agarwal |
filemerge: print correct name of tool for symlink checks
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 00:01:16 -0700 |
Siddharth Agarwal |
filemerge: normalize 'internal:foo' names to ':foo'
|
file |
diff |
annotate
|
| Tue, 06 Oct 2015 22:57:21 -0700 |
Siddharth Agarwal |
filemerge: use symlinkcheck for :merge and :union
|
file |
diff |
annotate
|
| Tue, 06 Oct 2015 22:56:33 -0700 |
Siddharth Agarwal |
filemerge: add a precheck for symlinks
|
file |
diff |
annotate
|
| Tue, 06 Oct 2015 22:55:21 -0700 |
Siddharth Agarwal |
filemerge: call precheck if available
|
file |
diff |
annotate
|
| Tue, 06 Oct 2015 22:54:14 -0700 |
Siddharth Agarwal |
filemerge: add a before-merge callback to internal merge tools
|
file |
diff |
annotate
|
| Tue, 06 Oct 2015 17:39:13 -0700 |
Siddharth Agarwal |
filemerge: indent filemerge.filemerge
|
file |
diff |
annotate
|
| Thu, 10 Sep 2015 09:41:11 -0400 |
Jordi Gutiérrez Hermoso |
filemerge: add non-interactive :merge-local and :merge-other
|
file |
diff |
annotate
|
| Sun, 16 Aug 2015 10:19:00 +0200 |
Erik Huelsmann |
filemerge: add 'union' merge to internal merge tool
|
file |
diff |
annotate
|
| Sun, 16 Aug 2015 00:24:29 +0200 |
Erik Huelsmann |
filemerge: split internal merge into api entry point and internal helper
|
file |
diff |
annotate
|
| Sat, 08 Aug 2015 19:15:09 -0700 |
Gregory Szorc |
filemerge: use absolute_import
|
file |
diff |
annotate
|
| Thu, 25 Jun 2015 17:46:55 -0500 |
Matt Mackall |
filemerge: mark internal-only config option
|
file |
diff |
annotate
|