[PATCH] Fix git-merge-cache -q