diff mercurial/minirst.py @ 18818:a0bff3d4f67b

manifestmerge: rename n to n1 and n2 An upcoming patch will combine the two loops into one, so it's important to distinguish between nodes in m1 and nodes in m2.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 24 Mar 2013 16:43:25 -0700
parents fabbaa250977
children 8ac7b85bd8f9
line wrap: on
line diff