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: 433686c12a088195bbf21b2e409c21df199ba988 (plain)
1
2
3
4
5
6
7
can_merge () {
	return 1
}

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