Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'br/mergetools-guiffy'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 25 Apr 2018 04:28:54 +0000
(13:28 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 25 Apr 2018 04:28:54 +0000
(13:28 +0900)
"git mergetools" learned talking to guiffy.
* br/mergetools-guiffy:
mergetools: add support for guiffy
mergetools/guiffy
[new file with mode: 0644]
patch
|
blob
raw
(from parent 1:
03f78e1
)
diff --git a/mergetools/guiffy
b/mergetools/guiffy
new file mode 100644
(file)
index 0000000..
8b23a13
--- /dev/null
+++ b/
mergetools/guiffy
@@ -0,0
+1,18
@@
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
+}
+
+merge_cmd () {
+ if $base_present
+ then
+ "$merge_tool_path" -s "$LOCAL" \
+ "$REMOTE" "$BASE" "$MERGED"
+ else
+ "$merge_tool_path" -m "$LOCAL" \
+ "$REMOTE" "$MERGED"
+ fi
+}
+
+exit_code_trustable () {
+ true
+}