Andrew's git / gitweb.git / mergetools/winmerge
?
mergetools / winmergeon commit git-p4: do not pass '-r 0' to p4 commands (bc23352)
   1diff_cmd () {
   2        "$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
   3        return 0
   4}
   5
   6merge_cmd () {
   7        # mergetool.winmerge.trustExitCode is implicitly false.
   8        # touch $BACKUP so that we can check_unchanged.
   9        touch "$BACKUP"
  10        "$merge_tool_path" -u -e -dl Local -dr Remote \
  11                "$LOCAL" "$REMOTE" "$MERGED"
  12        check_unchanged
  13}
  14
  15translate_merge_tool_path() {
  16        mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
  17}