comparison tests/test-double-merge @ 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 99a4592ea886
children 50b6af595e0c
comparison
equal deleted inserted replaced
7630:a679bd371091 7659:25ac72ca68f6