diff tests/test-bdiff.py.out @ 24784:59406b8b1303

rollback: clear resolve state (issue4593)
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Apr 2015 18:48:20 -0500
parents eeac5e179243
children 9a8363d23419
line wrap: on
line diff