Welcome to mirror list, hosted at ThFree Co, Russian Federation.

kompare « mergetools - git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
blob: 4ce23dbe8bbf72adf3cc06bd8928f61aa94ce020 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
can_merge () {
	return 1
}

diff_cmd_help () {
	echo "Use Kompare (requires a graphical session)"
}

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd_help () {
	echo "Use Kompare (requires a graphical session)"
}

exit_code_trustable () {
	true
}