Mercurial > hgrepos > DevTools > mercurial-extensions
view test2.txt @ 269:1e375da37f2e
First part of testing the a merge with yields conflicts (with tool ":merge3")
| author | Franz Glasner <hg@dom66.de> |
|---|---|
| date | Fri, 04 Jan 2019 17:09:30 +0100 |
| parents | 47b931eb39b9 |
| children |
line wrap: on
line source
This is a file with some replacement tests $HGheader$ $HGnodeid$ $Date$ $JustDate$ $HGrevision$ $Revision$ $Author$ $MySubstKeyword$ |VCSMySubstKeyword|
