diff CONTRIBUTORS @ 7734:9f73bddb9d0b

reset mergestate after commit
author Martin Geisler <mg@daimi.au.dk>
date Thu, 25 Dec 2008 10:42:01 +0100
parents c29efd272395
children
line wrap: on
line diff