From 4dbdc42d9e7c3968ff7f690d00680419c9b8cb0f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 9 Apr 2024 15:34:27 +0200 Subject: Adding upstream version 1:2.43.0. Signed-off-by: Daniel Baumann --- mergetools/smerge | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 mergetools/smerge (limited to 'mergetools/smerge') diff --git a/mergetools/smerge b/mergetools/smerge new file mode 100644 index 0000000..5410835 --- /dev/null +++ b/mergetools/smerge @@ -0,0 +1,20 @@ +diff_cmd () { + "$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED" +} + +diff_cmd_help () { + echo "Use Sublime Merge (requires a graphical session)" +} + +merge_cmd () { + if $base_present + then + "$merge_tool_path" mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED" + else + "$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED" + fi +} + +merge_cmd_help () { + echo "Use Sublime Merge (requires a graphical session)" +} -- cgit v1.2.3