diff tests/test-merge-default.out @ 7659:25ac72ca68f6

Add Lee Cantey's installer icon to win32 installer Add Lee Cantey's installer icon to contrib/win32 and update mercurial.iss accordingly
author Pascal Quantin <pascal.quantin@wavecom.com>
date Thu, 15 Jan 2009 14:19:29 +0100
parents 1fe6f365df2e
children 50b6af595e0c
line wrap: on
line diff