Author: hwright
Date: Mon Jun 6 19:51:10 2011
New Revision: 1132735
URL: http://svn.apache.org/viewvc?rev=1132735&view=rev
Log:
Remove a set of assignments which are not needed.
* subversion/libsvn_diff/diff3.c
(svn_diff__resolve_conflict): We don't need modified_length and latest_length
again, so don't bother restoring them.
Modified:
subversion/trunk/subversion/libsvn_diff/diff3.c
Modified: subversion/trunk/subversion/libsvn_diff/diff3.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/diff3.c?rev=1132735&r1=1132734&r2=1132735&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/diff3.c (original)
+++ subversion/trunk/subversion/libsvn_diff/diff3.c Mon Jun 6 19:51:10 2011
@@ -185,10 +185,6 @@ svn_diff__resolve_conflict(svn_diff_t *h
if ((*lcs_ref)->position[1]->offset == 1)
(*lcs_ref)->position[1] = *position_list2;
- /* Restore modified_length and latest_length */
- modified_length = hunk->modified_length;
- latest_length = hunk->latest_length;
-
/* Produce the resolved diff */
while (1)
{
