diff tests/test-confused-revert.t @ 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 a934b9249574
children fc1d75e7a98d
line wrap: on
line diff