Code

Merge branch 'maint-1.7.6' into maint-1.7.7
[git.git] / mergetools / bc3
1 diff_cmd () {
2         "$merge_tool_path" "$LOCAL" "$REMOTE"
3 }
5 merge_cmd () {
6         touch "$BACKUP"
7         if $base_present
8         then
9                 "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
10                         -mergeoutput="$MERGED"
11         else
12                 "$merge_tool_path" "$LOCAL" "$REMOTE" \
13                         -mergeoutput="$MERGED"
14         fi
15         check_unchanged
16 }
18 translate_merge_tool_path() {
19         echo bcompare
20 }