diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2009-02-14 11:12:43 +0100 |
---|---|---|
committer | Jean-Francois Moine <moinejf@free.fr> | 2009-02-14 11:12:43 +0100 |
commit | f957f39eafc6f6d168d3ae4f61f7a15a29cee6c8 (patch) | |
tree | 19db0887def3bf12dd92679fc773ba53fc100be6 /hgimport | |
parent | d0ee609e50f6eba78db4783e1374311be2e38ea5 (diff) | |
parent | adff0f37dc0f0ab48850eaad267223c634e975a2 (diff) | |
download | mediapointer-dvb-s2-f957f39eafc6f6d168d3ae4f61f7a15a29cee6c8.tar.gz mediapointer-dvb-s2-f957f39eafc6f6d168d3ae4f61f7a15a29cee6c8.tar.bz2 |
merge: v4l-dvb
Diffstat (limited to 'hgimport')
-rwxr-xr-x | hgimport | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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" |