Mercurial > hg
comparison tests/test-bookmarks-merge.t @ 24784:59406b8b1303
rollback: clear resolve state (issue4593)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 16 Apr 2015 18:48:20 -0500 |
parents | 10f15e34d86c |
children | 8197b395710e |
comparison
equal
deleted
inserted
replaced
24783:a7f8e3584ef3 | 24784:59406b8b1303 |
---|