diff en/examples/tour-merge-conflict @ 144:006bbad1f190

Add expected output files. This makes it possible to spot changes in Mercurial's output and behaviour over time.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 06 Mar 2007 21:44:56 -0800
parents ceaca14e49f0
children e281bd9a8e47
line wrap: on
line diff