mergetools/tortoisemerge


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17

can_diff () {
	return 1
}
 
merge_cmd () {
	if $base_present
	then
		touch "$BACKUP"
		"$merge_tool_path" \
			-base:"$BASE" -mine:"$LOCAL" \
			-theirs:"$REMOTE" -merged:"$MERGED"
		check_unchanged
	else
		echo "TortoiseMerge cannot be used without a base" 1>&2
		return 1
	fi
}