Tue, 08 Mar 2011 13:35:01 -0600 mergetools: add alternate registry keys for 32bit apps on 64bit O/S stable
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 13:35:01 -0600] rev 13566
mergetools: add alternate registry keys for 32bit apps on 64bit O/S Not all applications needed the workarounds, so I did not add alternate keys for every Windows merge application.
Tue, 08 Mar 2011 13:05:18 -0600 filemerge: introduce a 'regkeyalt' merge tool variable stable
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 13:05:18 -0600] rev 13565
filemerge: introduce a 'regkeyalt' merge tool variable This allows us to provide alternate search keys for 64bit operating systems that may have 32bit merge tools installed. Presumably it may find other uses.
Tue, 08 Mar 2011 10:25:18 -0600 merge with stable
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 10:25:18 -0600] rev 13564
merge with stable
(0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip