Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/merge.py @ 3134:4bf2e895cf86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff