Merge branch 'nd/document-err-packet'
[git/dscho.git] / mergetools / bc3
blob27b3dd48b840139acd65ea742e04221c6400a485
1 diff_cmd () {
2         "$merge_tool_path" "$LOCAL" "$REMOTE"
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
18 translate_merge_tool_path() {
19         echo bcompare