diff en/filelog.svg @ 401:e281bd9a8e47

Fix sample output for test 'tour-merge-conflict'. Fix test itself as well (now requires 'hg resolve').
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed, 20 Aug 2008 22:00:46 +0200
parents a880d07f2d29
children
line wrap: on
line diff