aboutsummaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2013-01-26 16:46:12 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-28 19:00:38 -0800
commit073678b8e6324a155fa99f40eee0637941a70a34 (patch)
treef9bdd837ffdfb50efabf58a73769477202e70b50 /mergetools
parent62957bea0c7637ae1db4452fc165c59d9408585b (diff)
downloadgit-073678b8e6324a155fa99f40eee0637941a70a34.tar.gz
git-073678b8e6324a155fa99f40eee0637941a70a34.tar.xz
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/defaults22
-rw-r--r--mergetools/gvimdiff1
-rw-r--r--mergetools/gvimdiff21
-rw-r--r--mergetools/vimdiff (renamed from mergetools/vim)0
-rw-r--r--mergetools/vimdiff21
5 files changed, 3 insertions, 22 deletions
diff --git a/mergetools/defaults b/mergetools/defaults
deleted file mode 100644
index 21e63ecc3..000000000
--- 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 000000000..04a5bb0ea
--- /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 000000000..04a5bb0ea
--- /dev/null
+++ b/mergetools/gvimdiff2
@@ -0,0 +1 @@
+. "$MERGE_TOOLS_DIR/vimdiff"
diff --git a/mergetools/vim b/mergetools/vimdiff
index 39d032771..39d032771 100644
--- a/mergetools/vim
+++ b/mergetools/vimdiff
diff --git a/mergetools/vimdiff2 b/mergetools/vimdiff2
new file mode 100644
index 000000000..04a5bb0ea
--- /dev/null
+++ b/mergetools/vimdiff2
@@ -0,0 +1 @@
+. "$MERGE_TOOLS_DIR/vimdiff"