summaryrefslogtreecommitdiffstats
path: root/mergetools/opendiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 14:47:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 14:47:53 +0000
commitc8bae7493d2f2910b57f13ded012e86bdcfb0532 (patch)
tree24e09d9f84dec336720cf393e156089ca2835791 /mergetools/opendiff
parentInitial commit. (diff)
downloadgit-c8bae7493d2f2910b57f13ded012e86bdcfb0532.tar.xz
git-c8bae7493d2f2910b57f13ded012e86bdcfb0532.zip
Adding upstream version 1:2.39.2.upstream/1%2.39.2upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mergetools/opendiff')
-rw-r--r--mergetools/opendiff22
1 files changed, 22 insertions, 0 deletions
diff --git a/mergetools/opendiff b/mergetools/opendiff
new file mode 100644
index 0000000..44adf8f
--- /dev/null
+++ b/mergetools/opendiff
@@ -0,0 +1,22 @@
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
+}
+
+diff_cmd_help () {
+ echo "Use FileMerge (requires a graphical session)"
+}
+
+merge_cmd () {
+ if $base_present
+ then
+ "$merge_tool_path" "$LOCAL" "$REMOTE" \
+ -ancestor "$BASE" -merge "$MERGED" | cat
+ else
+ "$merge_tool_path" "$LOCAL" "$REMOTE" \
+ -merge "$MERGED" | cat
+ fi
+}
+
+merge_cmd_help () {
+ echo "Use FileMerge (requires a graphical session)"
+}