← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/git-core/intrepid-updates

« back to all changes in this revision

Viewing changes to diffcore-break.c

  • Committer: Package Import Robot
  • Author(s): Gerrit Pape
  • Date: 2007-04-22 13:31:05 UTC
  • mfrom: (1.1.14)
  • Revision ID: package-import@ubuntu.com-20070422133105-tkmhz328g2p0epz1
Tags: 1:1.5.1.2-1
* new upstream point release.
* debian/changelog.upstream: upstream changes taken from mailing list
  announcement.

Show diffs side-by-side

added added

removed removed

Lines of Context:
diffcore-break.c
89
89
         * merge the surviving pair together if the score is
90
90
         * less than the minimum, after rename/copy runs.
91
91
         */
92
 
        *merge_score_p = src_removed * MAX_SCORE / src->size;
 
92
        *merge_score_p = (int)(src_removed * MAX_SCORE / src->size);
93
93
 
94
94
        /* Extent of damage, which counts both inserts and
95
95
         * deletes.