Andrew's git / gitweb.git / mergetools/kompare
?
mergetools / kompareon commit t3510: test that cherry-pick --abort does not unsafely change HEAD (aeebd98)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}