Andrew's git / gitweb.git / mergetools/kompare
?
mergetools / kompareon commit lock_ref_for_update(): don't re-read non-symbolic references (8169d0d)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}