Mercurial > hgbook
log en/examples/tour-merge-conflict.merge.out @ 648:bc14f94e726a
age | author | description |
---|---|---|
Thu, 29 Jan 2009 22:47:34 -0800 | Bryan O'Sullivan | Check in a known-broken example to fix up later - XXX |
Sat, 18 Oct 2008 12:07:16 -0500 | jerojasro | modifications to generate the examples for the book |
Wed, 20 Aug 2008 22:00:46 +0200 | Guido Ostkamp | Fix sample output for test 'tour-merge-conflict'. |
Tue, 06 Mar 2007 21:44:56 -0800 | Bryan O'Sullivan | Add expected output files. |