*unmerged

Costa Shulyupin · Costa Shulyupin · commit 0c1e4da3df27 · 2020-05-27T19:55:46.000+03:00
diff --git a/git-wizard b/git-wizard
@@ -183,8 +183,8 @@ report()
 
 in_progress()
 {
-	prs unmerged '%1 file(s)' 'diff --name-status --diff-filter=U | wc -l'
-	actg unmerged g "Run merge tool" mergetool
+	prs unmerged '%1 file(s)' 'ls-files --unmerged | cut -f2 | sort -u | wc -l'
+	actg unmerged t "Run merge tool" mergetool
 
 	prop s in_progress '%1' "$(git status --untracked-files=no HEAD | grep -q -e "You are" -e "in progress" && echo "an operation")"
 	actg in_progress ' ' "Check head status" 'status --untracked-files=no HEAD' # without modifered

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,8 @@ report()`
`183`	`183`
`184`	`184`	`in_progress()`
`185`	`185`	`{`
`186`		`- prs unmerged '%1 file(s)' 'diff --name-status --diff-filter=U \| wc -l'`
`187`		`- actg unmerged g "Run merge tool" mergetool`
	`186`	`+ prs unmerged '%1 file(s)' 'ls-files --unmerged \| cut -f2 \| sort -u \| wc -l'`
	`187`	`+ actg unmerged t "Run merge tool" mergetool`
`188`	`188`
`189`	`189`	`prop s in_progress '%1' "$(git status --untracked-files=no HEAD \| grep -q -e "You are" -e "in progress" && echo "an operation")"`
`190`	`190`	`actg in_progress ' ' "Check head status" 'status --untracked-files=no HEAD' # without modifered`