Path : /proc/2/cwd/proc/2/cwd/usr/libexec/git-core/mergetools/ |
Current File : //proc/2/cwd/proc/2/cwd/usr/libexec/git-core/mergetools/diffuse |
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" | cat } merge_cmd () { touch "$BACKUP" if $base_present then "$merge_tool_path" \ "$LOCAL" "$MERGED" "$REMOTE" \ "$BASE" | cat else "$merge_tool_path" \ "$LOCAL" "$MERGED" "$REMOTE" | cat fi check_unchanged }