summaryrefslogtreecommitdiff
path: root/hgimport
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2009-04-05 18:03:02 +0200
committerJean-Francois Moine <moinejf@free.fr>2009-04-05 18:03:02 +0200
commitbcaafb56e4c3741c1923db37683a4590dda2cbfb (patch)
tree4ade810f7cbd3425665c1ce57769745871565866 /hgimport
parentffa071fb6b99731b41db5e814dbb2b0403c7c98c (diff)
parent8dd3ceb79cec4a833fbc9fd654b7e71e9548d331 (diff)
downloadmediapointer-dvb-s2-bcaafb56e4c3741c1923db37683a4590dda2cbfb.tar.gz
mediapointer-dvb-s2-bcaafb56e4c3741c1923db37683a4590dda2cbfb.tar.bz2
merge: v4l-dvb
Diffstat (limited to 'hgimport')
-rwxr-xr-xhgimport4
1 files changed, 2 insertions, 2 deletions
diff --git a/hgimport b/hgimport
index a8f46554d..4baf89e2b 100755
--- a/hgimport
+++ b/hgimport
@@ -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"