diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-07-16 16:22:04 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-07-16 17:16:08 -0400 |
| commit | 76278801e7012e33b0f501858ca050983e07215d (patch) | |
| tree | 81ed683c608a640503b88d18ca82d414ce363bbe /ediff.git-mergetool | |
| parent | f45a9ef3b625239f48fc43a559dcb573d7454c21 (diff) | |
Add a `git-mergetool` stub for ediff
Diffstat (limited to 'ediff.git-mergetool')
| -rw-r--r-- | ediff.git-mergetool | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/ediff.git-mergetool b/ediff.git-mergetool new file mode 100644 index 0000000..8a267bd --- /dev/null +++ b/ediff.git-mergetool @@ -0,0 +1,20 @@ +diff_cmd () { + "$merge_tool_path" -c "$LOCAL" "$REMOTE" +} + +merge_cmd () { + if $base_present + then + "$merge_tool_path" -c \ + -3 "$LOCAL" "$REMOTE" "$BASE" \ + -m "$MERGED" + else + "$merge_tool_path" -c \ + "$LOCAL" "$REMOTE" \ + -m "$MERGED" + fi +} + +exit_code_trustable () { + true +} |