index
:
org/kernel/git.git
master
forked from git/git
git
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
mergetools
/
kompare
blob: 433686c12a088195bbf21b2e409c21df199ba988 (
plain
)
1
2
3
4
5
6
7
can_merge () { return 1 } diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" }