repo.or.cz
/
git
/
mingw
/
j6t.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
Merge branch 'rr/rebase-autostash-fix' into maint
[git/mingw/j6t.git]
/
mergetools
/
kompare
blob
433686c12a088195bbf21b2e409c21df199ba988
1
can_merge () {
2
return 1
3
}
4
5
diff_cmd () {
6
"$merge_tool_path" "$LOCAL" "$REMOTE"
7
}