Andrew's git / gitweb.git / mergetools/kompare
?
mergetools / kompareon commit am --skip: revert changes introduced by failed 3way merge (88d5072)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}