comparison tests/test-merge-commit @ 7500:ab3fb222b345

merge changes from stable
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Wed, 10 Dec 2008 11:30:11 +0100
parents 46280c004f22
children 6c82beaaa11a
comparison
equal deleted inserted replaced
7496:0a27d0db256d 7500:ab3fb222b345