index
:
git
main
maint
master
next
seen
todo
Mirror of https://git.kernel.org/pub/scm/git/git.git/
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
mergetools
/
kompare
blob: 433686c12a088195bbf21b2e409c21df199ba988 (
plain
) (
blame
)
1
2
3
4
5
6
7
can_merge () { return 1 } diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" }