Mercurial > public > mercurial-scm > hg-stable
log mercurial/filemerge.py @ 13740:dcb51f156fa6
age | author | description |
---|---|---|
Tue, 08 Mar 2011 13:05:18 -0600 | Steve Borho | filemerge: introduce a 'regkeyalt' merge tool variable stable |
Tue, 19 Oct 2010 22:33:52 -0500 | Steve Borho | merge: implement --tool arguments using new ui.forcemerge configurable |
Thu, 26 Aug 2010 17:55:07 +0200 | Thomas Arendsen Hein | merge with stable |