Mercurial > hg > easyhg
comparison images/logo-droplets.svg @ 294:fc9d411ff6e7
Fix some breakages from prior merge commit (oops); make merge result use more-information dialog
author | Chris Cannam |
---|---|
date | Mon, 21 Feb 2011 18:20:29 +0000 |
parents | 6d5a5571caec |
children |
comparison
equal
deleted
inserted
replaced
293:7b4f42cfc596 | 294:fc9d411ff6e7 |
---|