diff --git a/git-mergetool.sh b/git-mergetool.sh
index 2f8dc441c6d575323f2fad920ecdb7b20e1445e6..bacbda2bb75854235b912903c7e45fc94d38e719 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
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