diff tests/test-hybridencode.py.out @ 13566:a87a0fcb412f stable

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.
author Steve Borho <steve@borho.org>
date Tue, 08 Mar 2011 13:35:01 -0600
parents 34d8247a4595
children 81b115385bc7
line wrap: on
line diff