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