diff tests/test-rebase-newancestor.t @ 20233:410193f11422

commands.bookmarks: pass cur in explicitly to checkconflict cur will be moved inside the wlock in a future patch, so we need to pass it into checkconflict explicitly.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 21 Nov 2013 17:11:04 -0800
parents aa9385f983fa
children 65f215ea3e8e
line wrap: on
line diff