PHP 7.4.33
Preview: diffmerge Size: 309 B
//lib/git-core/mergetools/diffmerge
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

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
}

exit_code_trustable () {
	true
}

Directory Contents

Dirs: 0 × Files: 23
Name Size Perms Modified Actions
358 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
423 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
353 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
663 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
309 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
248 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
306 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
438 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
336 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
263 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
29 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
673 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
117 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
1.94 KB lrw-r--r-- 2026-02-26 19:49:53
Edit Download
29 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
267 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
617 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
264 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
258 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
602 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
1.19 KB lrw-r--r-- 2026-02-26 19:49:53
Edit Download
361 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
768 B lrw-r--r-- 2026-02-26 19:49:53
Edit Download
If ZipArchive is unavailable, a .tar will be created (no compression).