comparison contrib/mergetools.hgrc @ 9912:311eeb2f6951

Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Mon, 23 Nov 2009 22:46:48 +0100
parents 01bd0efef1b5
children 6b354a763617
comparison
equal deleted inserted replaced
9910:6f92997dbdca 9912:311eeb2f6951