comparison tests/test-ancestor.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 f7f8159caad3
children 2fa303619b4d
comparison
equal deleted inserted replaced
18604:a1141f04e368 18605:bcf29565d89f