diff options
Diffstat (limited to 'mergetools')
| -rw-r--r-- | mergetools/defaults | 22 | ||||
| -rw-r--r-- | mergetools/gvimdiff | 1 | ||||
| -rw-r--r-- | mergetools/gvimdiff2 | 1 | ||||
| -rw-r--r-- | mergetools/vimdiff (renamed from mergetools/vim) | 0 | ||||
| -rw-r--r-- | mergetools/vimdiff2 | 1 |
5 files changed, 3 insertions, 22 deletions
diff --git a/mergetools/defaults b/mergetools/defaults deleted file mode 100644 index 21e63ecc3e..0000000000 --- a/mergetools/defaults +++ /dev/null @@ -1,22 +0,0 @@ -# Redefined by builtin tools -can_merge () { - return 0 -} - -can_diff () { - return 0 -} - -diff_cmd () { - status=1 - return $status -} - -merge_cmd () { - status=1 - return $status -} - -translate_merge_tool_path () { - echo "$1" -} diff --git a/mergetools/gvimdiff b/mergetools/gvimdiff new file mode 100644 index 0000000000..04a5bb0ea8 --- /dev/null +++ b/mergetools/gvimdiff @@ -0,0 +1 @@ +. "$MERGE_TOOLS_DIR/vimdiff" diff --git a/mergetools/gvimdiff2 b/mergetools/gvimdiff2 new file mode 100644 index 0000000000..04a5bb0ea8 --- /dev/null +++ b/mergetools/gvimdiff2 @@ -0,0 +1 @@ +. "$MERGE_TOOLS_DIR/vimdiff" diff --git a/mergetools/vim b/mergetools/vimdiff index 39d032771b..39d032771b 100644 --- a/mergetools/vim +++ b/mergetools/vimdiff diff --git a/mergetools/vimdiff2 b/mergetools/vimdiff2 new file mode 100644 index 0000000000..04a5bb0ea8 --- /dev/null +++ b/mergetools/vimdiff2 @@ -0,0 +1 @@ +. "$MERGE_TOOLS_DIR/vimdiff" |