hgbook
log en/examples/tour-merge-conflict
| age | author | description |
|---|---|---|
| 2008-08-20 | Guido Ostkamp | Fix sample output for test 'tour-merge-conflict'. |
| 2007-03-06 | Bryan O'Sullivan | Add local regexps to ignore bits of output. |
| 2006-10-19 | Bryan O'Sullivan | More merge content. |