Mercurial > hg
view tests/test-merge1.out @ 1052:d8279ca39dc7
Adjust display and alignment of command options to match global options.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 26 Aug 2005 09:56:33 +0200 |
parents | 5a034646e472 |
children | 67a28636ea64 |
line wrap: on
line source
merging for b merging b This is file b1 merging for b merging b merging for b merging b