Mercurial > hg > mercurial-crew-with-dirclash
diff doc/hg.1.txt @ 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 | 214f42f23a3b |
children | d07d729ce306 |