msysGit-based Git for Windows 1.x was superseded by Git for Windows 2.x
[git/mingw/4msysgit.git] / mergetools / diffmerge
blob85ac7201571ed34c35a3613b97bd1b82982e0d61
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
14         status=$?