remote: release strbuf after use in read_remote_branches()

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 6b308ab6d0b52b8962da63a8bc268cdf3f7ed227..615e6bacde7355e3125268bc969d0fee2a06392e 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -288,7 +288,10 @@ After seeing a conflict, you can do two things:
 
  * Resolve the conflicts.  Git will mark the conflicts in
    the working tree.  Edit the files into shape and
-   'git add' them to the index.  Use 'git commit' to seal the deal.
+   'git add' them to the index.  Use 'git commit' or
+   'git merge --continue' to seal the deal. The latter command
+   checks whether there is a (interrupted) merge in progress
+   before calling 'git commit'.
 
 You can work through the conflict with a number of tools: