Mercurial > hg > pyhgsh
diff tests/test-walk @ 1495:1e265c2bec94
Deal with merge abort more gracefully
We save parent info last rather than first.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 02 Nov 2005 20:22:29 -0800 |
parents | 1c64c628d15f |
children | 1d7d0c07e8f3 |