diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-09 13:34:27 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-09 13:34:27 +0000 |
| commit | 4dbdc42d9e7c3968ff7f690d00680419c9b8cb0f (patch) | |
| tree | 47c1d492e9c956c1cd2b74dbd3b9d8b0db44dc4e /mergetools/smerge | |
| parent | Initial commit. (diff) | |
| download | git-4dbdc42d9e7c3968ff7f690d00680419c9b8cb0f.tar.xz git-4dbdc42d9e7c3968ff7f690d00680419c9b8cb0f.zip | |
Adding upstream version 1:2.43.0.upstream/1%2.43.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mergetools/smerge')
| -rw-r--r-- | mergetools/smerge | 20 |
1 files changed, 20 insertions, 0 deletions
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)" +} |