X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-mergetool.sh;h=bacbda2bb75854235b912903c7e45fc94d38e719;hb=a3f5e7a32ec2d885fe6ff7fc14ee91de391f1d72;hp=2f8dc441c6d575323f2fad920ecdb7b20e1445e6;hpb=20cb8e202520173727f3ea060e1eca035b32e2b7;p=git.git

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 2f8dc441c..bacbda2bb 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -269,7 +269,7 @@ rerere=false
 files_to_merge() {
     if test "$rerere" = true
     then
-	git rerere status
+	git rerere remaining
     else
 	git ls-files -u | sed -e 's/^[^	]*	//' | sort -u
     fi