Merge branch 'mh/avoid-rewriting-packed-refs' into maint
[git.git] / mergetools / bc
blob3a69e60faa9c95dcf388cd295d040e9b88e0defd
1 diff_cmd () {
2         "$merge_tool_path" "$LOCAL" "$REMOTE"
5 merge_cmd () {
6         if $base_present
7         then
8                 "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
9                         -mergeoutput="$MERGED"
10         else
11                 "$merge_tool_path" "$LOCAL" "$REMOTE" \
12                         -mergeoutput="$MERGED"
13         fi
16 translate_merge_tool_path() {
17         if type bcomp >/dev/null 2>/dev/null
18         then
19                 echo bcomp
20         else
21                 echo bcompare
22         fi