Merge branch 'sb/status-doc-fix'
[git] / mergetools / winmerge
1 diff_cmd () {
2         "$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
3         return 0
4 }
5
6 merge_cmd () {
7         # mergetool.winmerge.trustExitCode is implicitly false.
8         # touch $BACKUP so that we can check_unchanged.
9         "$merge_tool_path" -u -e -dl Local -dr Remote \
10                 "$LOCAL" "$REMOTE" "$MERGED"
11 }
12
13 translate_merge_tool_path() {
14         mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
15 }