[git] / mergetools / araxis

diff_cmd () {
	"$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -wait -merge -3 -a1 \
			"$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
	else
		"$merge_tool_path" -wait -2 \
			"$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
	fi
}

translate_merge_tool_path() {
	echo compare
}
Commit	Line	Data
bc7a96a8 DA	1	diff_cmd () {
	2	"$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
	3	}
	4
	5	merge_cmd () {
bc7a96a8 DA	6	if $base_present
	7	then
	8	"$merge_tool_path" -wait -merge -3 -a1 \
	9	"$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
	10	else
	11	"$merge_tool_path" -wait -2 \
	12	"$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
	13	fi
bc7a96a8 DA	14	}
	15
	16	translate_merge_tool_path() {
	17	echo compare
	18	}