summaryrefslogtreecommitdiff
path: root/hgimport
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2009-02-14 11:12:43 +0100
committerJean-Francois Moine <moinejf@free.fr>2009-02-14 11:12:43 +0100
commitf957f39eafc6f6d168d3ae4f61f7a15a29cee6c8 (patch)
tree19db0887def3bf12dd92679fc773ba53fc100be6 /hgimport
parentd0ee609e50f6eba78db4783e1374311be2e38ea5 (diff)
parentadff0f37dc0f0ab48850eaad267223c634e975a2 (diff)
downloadmediapointer-dvb-s2-f957f39eafc6f6d168d3ae4f61f7a15a29cee6c8.tar.gz
mediapointer-dvb-s2-f957f39eafc6f6d168d3ae4f61f7a15a29cee6c8.tar.bz2
merge: v4l-dvb
Diffstat (limited to 'hgimport')
-rwxr-xr-xhgimport2
1 files changed, 2 insertions, 0 deletions
diff --git a/hgimport b/hgimport
index 099acbc52..a8f46554d 100755
--- a/hgimport
+++ b/hgimport
@@ -104,3 +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"