merge: http://linuxtv.org/hg/~tap/bttv

From: Mauro Carvalho Chehab <mchehab@redhat.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

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"