✏️ 编辑：diffmerge
路径：
/usr/libexec/git-core/mergetools/diffmerge
大小：460 B · 修改：2025-11-17 16:38:17 · 权限：0644 · 只读（保存会失败）
← 返回目录
👁 查看
⬇ 下载
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 } diff_cmd_help () { echo "Use DiffMerge (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" --merge --result="$MERGED" \ "$LOCAL" "$BASE" "$REMOTE" else "$merge_tool_path" --merge \ --result="$MERGED" "$LOCAL" "$REMOTE" fi } merge_cmd_help () { echo "Use DiffMerge (requires a graphical session)" } exit_code_trustable () { true }
💾 保存
取消
保存为 UTF-8，换行统一为 LF