annotate mercurial/__init__.py @ 3234:cac7be0b9b99

merge: remove old merge function
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Oct 2006 12:06:33 -0500
parents 9117c6561b0b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source