| Thu, 08 Oct 2015 00:19:20 -0700 |
Siddharth Agarwal |
filemerge: deindent the parts of filemerge outside the try block
|
| Sun, 11 Oct 2015 20:47:04 -0700 |
Siddharth Agarwal |
filemerge: introduce a premerge flag and function
|
| Sun, 11 Oct 2015 12:56:21 -0700 |
Siddharth Agarwal |
filemerge: also return whether the merge is complete
|
| Sun, 11 Oct 2015 12:31:08 -0700 |
Siddharth Agarwal |
filemerge: add a wrapper around the filemerge function
|
| Wed, 07 Oct 2015 21:51:24 -0700 |
Siddharth Agarwal |
filemerge: clean up temp files in a finally block
|
| Wed, 07 Oct 2015 23:35:30 -0700 |
Siddharth Agarwal |
filemerge: move post-merge checks into a separate function
|
| Thu, 08 Oct 2015 14:18:43 -0700 |
Siddharth Agarwal |
filemerge._xmerge: drop no longer necessary 'if r:' check
|
| Thu, 08 Oct 2015 14:17:31 -0700 |
Siddharth Agarwal |
filemerge._idump: drop no longer necessary 'if r:' check
|
| Thu, 08 Oct 2015 14:16:19 -0700 |
Siddharth Agarwal |
filemerge._merge: drop no longer necessary 'if r:' check
|
| Wed, 07 Oct 2015 21:22:16 -0700 |
Siddharth Agarwal |
filemerge: call premerge directly from main merge function
|
| Wed, 07 Oct 2015 21:28:43 -0700 |
Siddharth Agarwal |
filemerge: move precheck to before files are written out
|
| Wed, 07 Oct 2015 22:58:52 -0700 |
Siddharth Agarwal |
filemerge: move 'merging' output to before file creation
|
| Wed, 07 Oct 2015 21:21:56 -0700 |
Siddharth Agarwal |
filemerge.filemerge: make a tuple containing merge paths on disk
|
| Wed, 07 Oct 2015 16:14:57 -0700 |
Siddharth Agarwal |
filemerge: switch trymerge boolean to mergetype enum
|
| Wed, 07 Oct 2015 15:13:41 -0700 |
Siddharth Agarwal |
filemerge: add some merge types
|
| Wed, 07 Oct 2015 00:27:23 -0700 |
Siddharth Agarwal |
filemerge: run symlink check for :merge3
|
| Wed, 07 Oct 2015 00:24:44 -0700 |
Siddharth Agarwal |
filemerge: print correct name of tool for symlink checks
|
| Wed, 07 Oct 2015 00:01:16 -0700 |
Siddharth Agarwal |
filemerge: normalize 'internal:foo' names to ':foo'
|
| Tue, 06 Oct 2015 22:57:21 -0700 |
Siddharth Agarwal |
filemerge: use symlinkcheck for :merge and :union
|
| Tue, 06 Oct 2015 22:56:33 -0700 |
Siddharth Agarwal |
filemerge: add a precheck for symlinks
|
| Tue, 06 Oct 2015 22:55:21 -0700 |
Siddharth Agarwal |
filemerge: call precheck if available
|
| Tue, 06 Oct 2015 22:54:14 -0700 |
Siddharth Agarwal |
filemerge: add a before-merge callback to internal merge tools
|
| Tue, 06 Oct 2015 17:39:13 -0700 |
Siddharth Agarwal |
filemerge: indent filemerge.filemerge
|
| Thu, 10 Sep 2015 09:41:11 -0400 |
Jordi Gutiérrez Hermoso |
filemerge: add non-interactive :merge-local and :merge-other
|
| Sun, 16 Aug 2015 10:19:00 +0200 |
Erik Huelsmann |
filemerge: add 'union' merge to internal merge tool
|
| Sun, 16 Aug 2015 00:24:29 +0200 |
Erik Huelsmann |
filemerge: split internal merge into api entry point and internal helper
|
| Sat, 08 Aug 2015 19:15:09 -0700 |
Gregory Szorc |
filemerge: use absolute_import
|
| Thu, 25 Jun 2015 17:46:55 -0500 |
Matt Mackall |
filemerge: mark internal-only config option
|
| Mon, 04 May 2015 10:01:03 +0900 |
Yuya Nishihara |
templater: remove noop calls of parsestring(s, quoted=False) (API)
|
| Thu, 19 Mar 2015 22:22:50 +0100 |
Mads Kiilerich |
merge: better debug messages before/after invoking external merge tool
|
