Use "git merge" instead of "git pull ."

diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 2451e6b1ea82317c649e47d7321beb1d1dce576f..8ff87fb3f9bee1c6955f84b66027037100ebbbd3 100644 (file)
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -17,6 +17,8 @@
 #       ("squash", "fixup", "edit", or "reword") and the SHA1 taken
 #       from the specified line.
 #
+#   "exec_cmd_with_args" -- add an "exec cmd with args" line.
+#
 #   "#" -- Add a comment line.
 #
 #   ">" -- Add a blank line.