← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge3.py

  • Committer: Vincent Ladeuil
  • Date: 2012-01-19 17:14:27 UTC
  • mto: (6437.3.18 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: v.ladeuil+lp@free.fr-20120119171427-xhxthhw3mtz35hpf
The https test server will now refuse connections if an ssl error occurs during the handshake. Ssl errors and certificate errors aborts requests without re-trying them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge3.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
17
18
 
18
19
# mbp: "you know that thing where cvs gives you conflict markers?"
19
20
# s: "i hate that."