FM / mergetools

/usr/libexec/git-core/mergetools

Name	Size	Mode	Actions
araxis	515	0644	edit dl rm
bc	584	0644	edit dl rm
codecompare	510	0644	edit dl rm
deltawalker	818	0644	edit dl rm
diffmerge	460	0644	edit dl rm
diffuse	395	0644	edit dl rm
ecmerge	453	0644	edit dl rm
emerge	535	0644	edit dl rm
examdiff	493	0644	edit dl rm
guiffy	432	0644	edit dl rm
gvimdiff	29	0644	edit dl rm
kdiff3	818	0644	edit dl rm
kompare	264	0644	edit dl rm
meld	2213	0644	edit dl rm
nvimdiff	29	0644	edit dl rm
opendiff	418	0644	edit dl rm
smerge	423	0644	edit dl rm
tkdiff	403	0644	edit dl rm
tortoisemerge	761	0644	edit dl rm
vimdiff	17505	0644	edit dl rm
winmerge	510	0644	edit dl rm
xxdiff	913	0644	edit dl rm

Edit: /usr/libexec/git-core/mergetools/emerge (535B)

diff_cmd () { "$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE" } diff_cmd_help () { echo "Use Emacs' Emerge" } 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 } merge_cmd_help () { echo "Use Emacs' Emerge" } translate_merge_tool_path() { echo emacs } exit_code_trustable () { true }