summaryrefslogtreecommitdiffstats
path: root/mergetools/tkdiff
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/tkdiff
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/tkdiff')
-rw-r--r--mergetools/tkdiff24
1 files changed, 24 insertions, 0 deletions
diff --git a/mergetools/tkdiff b/mergetools/tkdiff
new file mode 100644
index 0000000..66906a7
--- /dev/null
+++ b/mergetools/tkdiff
@@ -0,0 +1,24 @@
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
+}
+
+diff_cmd_help () {
+ echo "Use TkDiff (requires a graphical session)"
+}
+
+merge_cmd () {
+ if $base_present
+ then
+ "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
+ else
+ "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
+ fi
+}
+
+exit_code_trustable () {
+ true
+}
+
+merge_cmd_help () {
+ echo "Use TkDiff (requires a graphical session)"
+}