diff mercurial/httppeer.py @ 26527:b4aab4223102

filemerge.filemerge: make a tuple containing merge paths on disk We're going to need this same tuple elsewhere.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 07 Oct 2015 21:21:56 -0700
parents 7bbdb78d2842
children 56b2bcea2529
line wrap: on
line diff