summaryrefslogtreecommitdiff
path: root/hgimport
diff options
context:
space:
mode:
Diffstat (limited to 'hgimport')
-rwxr-xr-xhgimport3
1 files changed, 3 insertions, 0 deletions
diff --git a/hgimport b/hgimport
index 099acbc52..ad73f2caf 100755
--- a/hgimport
+++ b/hgimport
@@ -104,3 +104,6 @@ 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"
+