Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
[git/jnareb-git.git] / mergetools / bc3
blobb6319d206e2333e42469486604d4635e846e5faa
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         if type bcomp >/dev/null 2>/dev/null
20         then
21                 echo bcomp
22         else
23                 echo bcompare
24         fi