https://github.com/git/git
Raw File
Tip revision: 15304344342b7c888f732d28f908890d874bcb0c authored by Junio C Hamano on 13 April 2022, 22:21:26 UTC
Git 2.32.2
Tip revision: 1530434
ecmerge
diff_cmd () {
	"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
			--default --mode=merge3 --to="$MERGED"
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			--default --mode=merge2 --to="$MERGED"
	fi
}
back to top