Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 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 | 2ef0b3aae186 |
children | c82ea81d6850 |
comparison
equal
deleted
inserted
replaced
3133:02b22fefc01f | 3134:4bf2e895cf86 |
---|