diff options
| author | David Aguilar <davvid@gmail.com> | 2013-01-27 00:46:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-29 03:00:38 (GMT) |
| commit | 073678b8e6324a155fa99f40eee0637941a70a34 (patch) | |
| tree | f9bdd837ffdfb50efabf58a73769477202e70b50 /mergetools | |
| parent | 62957bea0c7637ae1db4452fc165c59d9408585b (diff) | |
| download | git-073678b8e6324a155fa99f40eee0637941a70a34.zip git-073678b8e6324a155fa99f40eee0637941a70a34.tar.gz git-073678b8e6324a155fa99f40eee0637941a70a34.tar.bz2 | |
mergetools: simplify how we handle "vim" and "defaults"
Remove the exceptions for "vim" and "defaults" in the mergetool library
so that every filename in mergetools/ matches 1:1 with the name of a
valid built-in tool.
Define the trivial fallback definition of shell functions in-line in
git-mergetool-lib script, instead of dot-sourcing them from another
file. The result is much easier to follow.
[jc: squashed in an update from John Keeping as well]
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 21e63ec..0000000 --- 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 0000000..04a5bb0 --- /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 0000000..04a5bb0 --- /dev/null +++ b/mergetools/gvimdiff2 @@ -0,0 +1 @@ +. "$MERGE_TOOLS_DIR/vimdiff" diff --git a/mergetools/vim b/mergetools/vimdiff index 39d0327..39d0327 100644 --- a/mergetools/vim +++ b/mergetools/vimdiff diff --git a/mergetools/vimdiff2 b/mergetools/vimdiff2 new file mode 100644 index 0000000..04a5bb0 --- /dev/null +++ b/mergetools/vimdiff2 @@ -0,0 +1 @@ +. "$MERGE_TOOLS_DIR/vimdiff" |