Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-conflict @ 3134:4bf2e895cf86
filectx: add rename-aware ancestor algorithm
This code works but may trigger recursion depth issues
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 19 Sep 2006 14:58:54 -0500 |
parents | e506c14382fd |
children | 46280c004f22 |