Mercurial > hg
comparison tests/test-ancestor.py.out @ 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 | f7f8159caad3 |
| children | 731b2a90983b |
comparison
equal
deleted
inserted
replaced
| 20232:5fe4c1a9dc34 | 20233:410193f11422 |
|---|