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
|