Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
[git/jnareb-git.git] / mergetools / tkdiff
blob618c438e8765a485ffcc70a105fb0cf46010540c
1 diff_cmd () {
2         "$merge_tool_path" "$LOCAL" "$REMOTE"
5 merge_cmd () {
6         if $base_present
7         then
8                 "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
9         else
10                 "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
11         fi