*in_progress

Author: Costa Shulyupin

git-wizard

@@ -229,8 +229,9 @@ in_progress()
 	prs unmerged '%1 file(s)' 'ls-files --unmerged | cut -f2 | sort -u | wc -l'
 	actg unmerged t "Run merge tool" mergetool
 	[ $prop[conflicted] = 0 ] && actg unmerged a "Add" "add \$(git diff --name-only --relative)"
-
-	prop s in_progress '%1' "$(git status --untracked-files=no HEAD | grep -q -e "You are" -e "in progress" && echo "an operation")"
+	# git diff --diff-filter=U --name-only
+	# git add $(git diff --diff-filter=U --name-only)
+	prop s in_progress '%1' "$(git status --untracked-files=no HEAD | grep -q -i -e "you are" -e "in progress" && echo "an operation")"
 	actg in_progress ' ' "Check head status" 'status --untracked-files=no HEAD' # without modifered
 	git-status-parse
 	# TODO: