We can still check merge conflicts even if there are skipped files

nvie · Jan 5, 2022 · 0b38d48 · 0b38d48
1 parent 7227492
commit 0b38d48
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/git-merges-cleanly b/git-merges-cleanly
@@ -30,7 +30,7 @@ branch=$1
 
 git sha -q "$1"
 
-if git is-dirty; then
+if git is-dirty -iw; then
   echo "Can't check when you have local changes." >&2
   exit 2
 fi