diff tests/test-parseindex2.py @ 18605:bcf29565d89f

manifestmerge: pass in branchmerge and force separately This will be used in an upcoming patch.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 08 Feb 2013 15:23:23 +0000
parents e22d6b1dec1d
children e57c532c3835
line wrap: on
line diff