golden hour

/usr/libexec/git-core/mergetools

⬆️ Go Up

Upload

File/Folder	Size	Actions
araxis	392 B	Del OK
bc3	401 B	Del OK
codecompare	387 B	Del OK
deltawalker	628 B	Del OK
diffuse	282 B	Del OK
ecmerge	340 B	Del OK
emerge	415 B	Del OK
gvimdiff	29 B	Del OK
gvimdiff2	29 B	Del OK
kdiff3	499 B	Del OK
kompare	83 B	Del OK
meld	680 B	Del OK
opendiff	301 B	Del OK
tkdiff	224 B	Del OK
tortoisemerge	638 B	Del OK
vimdiff	625 B	Del OK
vimdiff2	29 B	Del OK
xxdiff	618 B	Del OK

Edit: bc3

diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } merge_cmd () { touch "$BACKUP" if $base_present then "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \ -mergeoutput="$MERGED" else "$merge_tool_path" "$LOCAL" "$REMOTE" \ -mergeoutput="$MERGED" fi check_unchanged } translate_merge_tool_path() { if type bcomp >/dev/null 2>/dev/null then echo bcomp else echo bcompare fi }
Save