projects
/
platform
/
upstream
/
git.git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
history
|
raw
|
HEAD
Imported Upstream version 2.12.0
[platform/upstream/git.git]
/
mergetools
/
kompare
1
can_merge () {
2
return 1
3
}
4
5
diff_cmd () {
6
"$merge_tool_path" "$LOCAL" "$REMOTE"
7
}
8
9
exit_code_trustable () {
10
true
11
}