tgupdate: merge release into t/js/localtz base
[git/gitweb.git] / mergetools / kompare
blob433686c12a088195bbf21b2e409c21df199ba988
1 can_merge () {
2         return 1
5 diff_cmd () {
6         "$merge_tool_path" "$LOCAL" "$REMOTE"