diff options
Diffstat (limited to 'hgimport')
-rwxr-xr-x | hgimport | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -104,5 +104,5 @@ done echo To cherry pick all files, you can do something like: echo "for i in $TMP/*.patch; do ./mailimport \$i; done" -echo "To merge it, the better is to do:" -echo "hg pull $1 && hg merge && hg commit && make && hg push" +echo "To merge it, the better is to run the merge script:" +echo "./v4l/scripts/do_merge.pl $1" |