Andrew's git / gitweb.git / mergetools/kompare
?
mergetools / kompareon commit test-lib: rearrange start/end of test_expect_* and test_skip (ae75342)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}