Merge branch 'tg/conflict-marker-size'
[git/debian.git] / mergetools / opendiff
blobb608dd6de30aaab9b30729145029761330f9fb55
1 diff_cmd () {
2         "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
5 merge_cmd () {
6         if $base_present
7         then
8                 "$merge_tool_path" "$LOCAL" "$REMOTE" \
9                         -ancestor "$BASE" -merge "$MERGED" | cat
10         else
11                 "$merge_tool_path" "$LOCAL" "$REMOTE" \
12                         -merge "$MERGED" | cat
13         fi