Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-conflict @ 3233:3fd098e0902d
merge: extend file merge function for renames
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 02 Oct 2006 12:04:48 -0500 |
parents | e506c14382fd |
children | 46280c004f22 |