$29 GRAYBYTE WORDPRESS FILE MANAGER $72

SERVER : premium201.web-hosting.com #1 SMP Wed Mar 26 12:08:09 UTC 2025
SERVER IP : 172.67.162.162 | ADMIN IP 216.73.216.174
OPTIONS : CRL = ON | WGT = ON | SDO = OFF | PKEX = OFF
DEACTIVATED : NONE

/usr/libexec/git-core/mergetools/

HOME
Current File : /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
}


Current_dir [ NOT WRITEABLE ] Document_root [ WRITEABLE ]


[ Back ]
NAME
SIZE
LAST TOUCH
USER
CAN-I?
FUNCTIONS
..
--
23 Jul 2025 2.08 PM
root / root
0755
araxis
0.503 KB
13 Jun 2025 10.14 PM
root / root
0644
bc
0.57 KB
13 Jun 2025 10.14 PM
root / root
0644
codecompare
0.498 KB
13 Jun 2025 10.14 PM
root / root
0644
deltawalker
0.799 KB
13 Jun 2025 10.14 PM
root / root
0644
diffmerge
0.449 KB
13 Jun 2025 10.14 PM
root / root
0644
diffuse
0.386 KB
13 Jun 2025 10.14 PM
root / root
0644
ecmerge
0.442 KB
13 Jun 2025 10.14 PM
root / root
0644
emerge
0.522 KB
13 Jun 2025 10.14 PM
root / root
0644
examdiff
0.481 KB
13 Jun 2025 10.14 PM
root / root
0644
guiffy
0.422 KB
13 Jun 2025 10.14 PM
root / root
0644
gvimdiff
0.028 KB
13 Jun 2025 10.14 PM
root / root
0644
kdiff3
0.799 KB
13 Jun 2025 10.14 PM
root / root
0644
kompare
0.258 KB
13 Jun 2025 10.14 PM
root / root
0644
meld
2.161 KB
13 Jun 2025 10.14 PM
root / root
0644
nvimdiff
0.028 KB
13 Jun 2025 10.14 PM
root / root
0644
opendiff
0.408 KB
13 Jun 2025 10.14 PM
root / root
0644
smerge
0.413 KB
13 Jun 2025 10.14 PM
root / root
0644
tkdiff
0.394 KB
13 Jun 2025 10.14 PM
root / root
0644
tortoisemerge
0.743 KB
13 Jun 2025 10.14 PM
root / root
0644
vimdiff
17.095 KB
13 Jun 2025 10.14 PM
root / root
0644
winmerge
0.498 KB
13 Jun 2025 10.14 PM
root / root
0644
xxdiff
0.892 KB
13 Jun 2025 10.14 PM
root / root
0644

GRAYBYTE WORDPRESS FILE MANAGER @ 2025 CONTACT ME
Static GIF