Mercurial > hg
comparison tests/test-convert.out @ 6923:ebf1462f2145
strip trailing whitespace, replace tabs by spaces
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Thu, 21 Aug 2008 11:35:17 +0200 |
parents | 6e253aa04ff7 |
children | b072266a83d1 |
comparison
equal
deleted
inserted
replaced
6922:1ec2d227a521 | 6923:ebf1462f2145 |
---|---|
113 --config convert.cvsps.mergefrom='{{mergefrombranch ([-\w]+)}}' | 113 --config convert.cvsps.mergefrom='{{mergefrombranch ([-\w]+)}}' |
114 Specify a regular expression to which commit log messages are | 114 Specify a regular expression to which commit log messages are |
115 matched. If a match occurs, then the conversion process will | 115 matched. If a match occurs, then the conversion process will |
116 add the most recent revision on the branch indicated in the | 116 add the most recent revision on the branch indicated in the |
117 regex as the second parent of the changeset. | 117 regex as the second parent of the changeset. |
118 | 118 |
119 The hgext/convert/cvsps wrapper script allows the builtin changeset | 119 The hgext/convert/cvsps wrapper script allows the builtin changeset |
120 merging code to be run without doing a conversion. Its parameters and | 120 merging code to be run without doing a conversion. Its parameters and |
121 output are similar to that of cvsps 2.1. | 121 output are similar to that of cvsps 2.1. |
122 | 122 |
123 Subversion Source | 123 Subversion Source |