about summary refs log blame commit diff
path: root/mergetools/smerge
blob: 9c2e6f6fd7d0a72c200b9f68f1f0f926318a27ba (plain) (tree)
1
2
3
4
5
6
7
8
9
10
11
12











                                                                                    
diff_cmd () {
	"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"
	else
		"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
	fi
}