comparison mercurial/simplemerge.py @ 26882:c4895f9b8ab1 stable

changegroup: back code change of e7c618cee8df out The previous changeset is a simpler way of fixing issue4934 without changing the spirit of the code. We can remove the dual call to 'delayupdate' but we keep the tests to show that the issue is still fixed.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 06 Nov 2015 13:01:15 -0500
parents ef1eb6df7071
children a504794cee29
comparison
equal deleted inserted replaced
26881:6b1ea6961554 26882:c4895f9b8ab1