about summary refs log tree commit diff
path: root/third_party/git/mergetools/araxis
blob: e2407b65b70d1e622979cdb2fe0e425ba6403ee1 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
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
}