Andrew's git / gitweb.git / mergetools/p4merge
?
mergetools / p4mergeon commit Merge branch 'maint' of git://github.com/git-l10n/git-po into maint (3b942e9)
   1diff_cmd () {
   2        "$merge_tool_path" "$LOCAL" "$REMOTE"
   3}
   4
   5merge_cmd () {
   6        touch "$BACKUP"
   7        $base_present || >"$BASE"
   8        "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
   9        check_unchanged
  10}