Mercurial > hg

diff mercurial/help/merge-tools.txt @ 18818:a0bff3d4f67b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 979b107eaea2
children f1a3ae7c15df
line wrap: on
line diff