Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/cmdutil.py @ 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 | eeaf9bcdfa25 |
children | a33a9af1ec03 |