Mercurial > hg > mercurial-crew-with-dirclash
diff contrib/mercurial.el @ 2799:b550cd82f92a
Move merge code to its own module
Pull update and merge3 out of localrepo into merge.py
s/self/repo/
Add temporary API function in hg.py
Convert all users
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 03 Aug 2006 15:24:41 -0500 |
parents | a5c43944e1ee |
children | 0ffca0cb9f4b |