diff --git a/git-mergetool.sh b/git-mergetool.sh index bf86270..cce3b0d 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -453,10 +453,10 @@ then then files=$(git rerere remaining) else - files=$(git ls-files -u | sed -e 's/^[^ ]* //' | sort -u) + files=$(git ls-files -u | sed -e 's/^[^ ]* //' | sort -u -r) fi else - files=$(git ls-files -u -- "$@" | sed -e 's/^[^ ]* //' | sort -u) + files=$(git ls-files -u -- "$@" | sed -e 's/^[^ ]* //' | sort -u -r) fi if test -z "$files"