✏️ 编辑:smerge
路径:
/usr/libexec/git-core/mergetools/smerge
大小:423 B · 修改:2025-11-17 16:38:17 · 权限:0644 · 只读(保存会失败)
← 返回目录
👁 查看
⬇ 下载
diff_cmd () { "$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED" } diff_cmd_help () { echo "Use Sublime Merge (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED" else "$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED" fi } merge_cmd_help () { echo "Use Sublime Merge (requires a graphical session)" }
💾 保存
取消
保存为 UTF-8,换行统一为 LF