Enable output buffering in merge-recursive.

diff --git a/git-checkout.sh b/git-checkout.sh
index a2b8e4fa4aa3607ce4981c84b9c6f9d31a9dec97..66e40b90ebfa8e65e9c42731203f10dde0424b8c 100755 (executable)
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -135,11 +135,7 @@ fi
 
 # We are switching branches and checking out trees, so
 # we *NEED* to be at the toplevel.
-cdup=$(git-rev-parse --show-cdup)
-if test ! -z "$cdup"
-then
-       cd "$cdup"
-fi
+cd_to_toplevel
 
 [ -z "$new" ] && new=$old && new_name="$old_name"