Andrew's git / gitweb.git / mergetools/kompare
?
mergetools / kompareon commit unpack-trees: fix "read-tree -u --reset A B" with conflicted index (b018ff6)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}