git-multimail: update to release 1.2.0
[git.git] / mergetools / diffmerge
blobf138cb4e731018b40426337eb8062f40512df088
1 diff_cmd () {
2         "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
5 merge_cmd () {
6         if $base_present
7         then
8                 "$merge_tool_path" --merge --result="$MERGED" \
9                         "$LOCAL" "$BASE" "$REMOTE"
10         else
11                 "$merge_tool_path" --merge \
12                         --result="$MERGED" "$LOCAL" "$REMOTE"
13         fi