diff options
Diffstat (limited to 'third_party/git/mergetools/smerge')
| -rw-r--r-- | third_party/git/mergetools/smerge | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/third_party/git/mergetools/smerge b/third_party/git/mergetools/smerge new file mode 100644 index 000000000000..9c2e6f6fd7d0 --- /dev/null +++ b/third_party/git/mergetools/smerge @@ -0,0 +1,12 @@ +diff_cmd () { + "$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED" +} + +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 +} |