diff tests/test-merge5 @ 7665:950484f05f16

Update win32 merge tools configuration Add WinMerge and Beyond Compare 3 to default merge tools configuration. Fix TortoiseMerge configuration.
author Pascal Quantin <pascal.quantin@gmail.com>
date Sat, 17 Jan 2009 18:51:40 +0100
parents 6aa4a3fa4e60
children
line wrap: on
line diff