aboutsummaryrefslogtreecommitdiff
path: root/mergetools/meld
blob: 7a08470f8836e14824a215b29e0c3a5dbeba9c17 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if test -z "${meld_has_output_option:+set}"
	then
		check_meld_for_output_version
	fi

	if test "$meld_has_output_option" = true
	then
		"$merge_tool_path" --output="$MERGED" \
			"$LOCAL" "$BASE" "$REMOTE"
	else
		"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
	fi
}

# Check whether we should use 'meld --output <file>'
check_meld_for_output_version () {
	meld_path="$(git config mergetool.meld.path)"
	meld_path="${meld_path:-meld}"

	if meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
	then
		: use configured value
	elif "$meld_path" --help 2>&1 |
		grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null
	then
		: old ones mention --output and new ones just say OPTION...
		meld_has_output_option=true
	else
		meld_has_output_option=false
	fi
}