comparison mercurial/help/hgignore.5.txt @ 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 9c963a43ecfb
children 8fe5fc8d7b8e
comparison
equal deleted inserted replaced
20232:5fe4c1a9dc34 20233:410193f11422