Merge branch 'nv/doc-config-signingkey'
[git] / mergetools / codecompare
1 diff_cmd () {
2         "$merge_tool_path" "$LOCAL" "$REMOTE"
3 }
4
5 merge_cmd () {
6         touch "$BACKUP"
7         if $base_present
8         then
9                 "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \
10                         -RF="$MERGED"
11         else
12                 "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \
13                         -RF="$MERGED"
14         fi
15         check_unchanged
16 }
17
18 translate_merge_tool_path() {
19         if merge_mode
20         then
21                 echo CodeMerge
22         else
23                 echo CodeCompare
24         fi
25 }