Mercurial > public > mercurial-scm > hg
log mercurial/filemerge.py @ 6533:65f1b97484be
age | author | description |
---|---|---|
Sun, 13 Apr 2008 11:31:45 -0500 | Matt Mackall | Merge with -stable |
Fri, 04 Apr 2008 02:21:53 +0300 | Dov Feldstern | use internal merge tool when specified for a merge-pattern in hgrc |
Thu, 10 Apr 2008 15:02:24 -0500 | Matt Mackall | merge: introduce mergestate |