merge_trees(): ensure that the callers release output buffer

diff --git a/Documentation/git-shell.txt b/Documentation/git-shell.txt
index e4bdd2235ca4ea9b853e1b568203411da1cc3b84..2e30a3e42d4e4e2bab580b0dcb5701ca3b33aeed 100644 (file)
--- a/Documentation/git-shell.txt
+++ b/Documentation/git-shell.txt
@@ -24,7 +24,7 @@ named `git-shell-commands` in the user's home directory.
 COMMANDS
 --------
 
-'git shell' accepts the following commands after the '-c' option:
+'git shell' accepts the following commands after the `-c` option:
 
 'git receive-pack <argument>'::
 'git upload-pack <argument>'::
@@ -43,7 +43,7 @@ directory.
 INTERACTIVE USE
 ---------------
 
-By default, the commands above can be executed only with the '-c'
+By default, the commands above can be executed only with the `-c`
 option; the shell is not interactive.
 
 If a `~/git-shell-commands` directory is present, 'git shell'