Mercurial > hg > mercurial-crew-with-dirclash
diff hgmerge @ 3236:696c656202a0
context: make filectx remember changectx in changectx.filectx
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 02 Oct 2006 15:02:28 -0500 |
parents | 6a03cff2b0f5 |
children | e4480f2b61e9 |