Show More
@@ -731,11 +731,13 b' fn compare_value<A: Fn(Revision, Revisio' | |||||
731 | } else { |
|
731 | } else { | |
732 | // The last value comes the current merge, this value -will- win |
|
732 | // The last value comes the current merge, this value -will- win | |
733 | // eventually. |
|
733 | // eventually. | |
|
734 | oracle.record_overwrite(src_minor.rev, src_major.rev); | |||
734 | MergePick::Major |
|
735 | MergePick::Major | |
735 | } |
|
736 | } | |
736 | } else if src_minor.rev == current_merge { |
|
737 | } else if src_minor.rev == current_merge { | |
737 | // The last value comes the current merge, this value -will- win |
|
738 | // The last value comes the current merge, this value -will- win | |
738 | // eventually. |
|
739 | // eventually. | |
|
740 | oracle.record_overwrite(src_major.rev, src_minor.rev); | |||
739 | MergePick::Minor |
|
741 | MergePick::Minor | |
740 | } else if src_major.path == src_minor.path { |
|
742 | } else if src_major.path == src_minor.path { | |
741 | // we have the same value, but from other source; |
|
743 | // we have the same value, but from other source; |
General Comments 0
You need to be logged in to leave comments.
Login now