✏️ 正在编辑: diffmerge
路径:
/usr/libexec/git-core/mergetools/diffmerge
提示:
您可以编辑任何文件(包括二进制文件),但请注意不当修改可能导致文件损坏。
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 }
💾 保存文件
← 返回文件管理器