Mercurial > hg

diff tests/test-merge-force.t @ 33663:1814ca418b30 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branchmap: revert c34532365b38 for Python 2.7 compatibility Old versions of python 2.7 don't like that the second argument to struct.unpack_from is a bytearray, so the change removing the util.buffer around that argument in branchmap broke running on older versions of python 2.7. Differential Revision: https://phab.mercurial-scm.org/D330
author Mike Hommey <mh@glandium.org>
date Thu, 10 Aug 2017 20:47:19 -0700
parents 75be14993fda
children 41ef02ba329b
line wrap: on
line diff