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

Dir : /usr/libexec/git-core/mergetools/
Server: Linux int2.cpanelhost.cl 3.10.0-962.3.2.lve1.5.88.el7.x86_64 #1 SMP Fri Sep 26 14:06:42 UTC 2025 x86_64
IP: 138.117.148.152
Choose File :

Url:
Dir : //usr/libexec/git-core/mergetools/emerge

diff_cmd () {
	"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" \
			-f emerge-files-with-ancestor-command \
			"$LOCAL" "$REMOTE" "$BASE" \
			"$(basename "$MERGED")"
	else
		"$merge_tool_path" \
			-f emerge-files-command \
			"$LOCAL" "$REMOTE" \
			"$(basename "$MERGED")"
	fi
	status=$?
}

translate_merge_tool_path() {
	echo emacs
}