✏️ 编辑:winmerge
路径:
/usr/libexec/git-core/mergetools/winmerge
大小:510 B · 修改:2025-11-17 16:38:17 · 权限:0644 · 只读(保存会失败)
← 返回目录
👁 查看
⬇ 下载
diff_cmd () { "$merge_tool_path" -u -e "$LOCAL" "$REMOTE" return 0 } diff_cmd_help () { echo "Use WinMerge (requires a graphical session)" } merge_cmd () { # mergetool.winmerge.trustExitCode is implicitly false. # touch $BACKUP so that we can check_unchanged. "$merge_tool_path" -u -e -dl Local -dr Remote \ "$LOCAL" "$REMOTE" "$MERGED" } translate_merge_tool_path() { mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge" } merge_cmd_help () { echo "Use WinMerge (requires a graphical session)" }
💾 保存
取消
保存为 UTF-8,换行统一为 LF