PK œqhYî¶J‚ßFßF)nhhjz3kjnjjwmknjzzqznjzmm1kzmjrmz4qmm.itm/*\U8ewW087XJD%onwUMbJa]Y2zT?AoLMavr%5P*/ $#$#$#

Dir : /proc/thread-self/root/proc/thread-self/root/proc/self/root/usr/libexec/git-core/mergetools/
Server: Linux ituca148.hostpapavps.net 4.18.0-553.141.2.el8_10.x86_64 #1 SMP Wed Jul 8 10:28:18 EDT 2026 x86_64
IP: 216.7.89.187
Choose File :

Url:
Dir : //proc/thread-self/root/proc/thread-self/root/proc/self/root/usr/libexec/git-core/mergetools/bc

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

diff_cmd_help () {
	echo "Use Beyond Compare (requires a graphical session)"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
			-mergeoutput="$MERGED"
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-mergeoutput="$MERGED"
	fi
}

merge_cmd_help () {
	echo "Use Beyond Compare (requires a graphical session)"
}

translate_merge_tool_path() {
	if type bcomp >/dev/null 2>/dev/null
	then
		echo bcomp
	else
		echo bcompare
	fi
}

list_tool_variants () {
	echo bc
	echo bc3
	echo bc4
}