Merge pull request #199 from TAAPArthur/master

kiss-preferred: new utility to list all current conflicts resolutions.

contrib/kiss-preferred

@@ -0,0 +1,7 @@
+#!/bin/sh -e
+# Lists the owners of all files with conflicts
+
+kiss a | sort -u -k2 | while read -r _ path; do
+    echo "$(kiss owns "$path")" "$path"
+done
+

kiss

@@ -1443,7 +1443,7 @@ args() {
     #
     # This handles the globbing characters '*', '!', '[' and ']' as per:
     # https://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html
-    [ "${action##[as]*}" ] && case "$*" in *\**|*\!*|*\[*|*\]*)
+    [ "${action##[aos]*}" ] && case "$*" in *\**|*\!*|*\[*|*\]*)
         die "Arguments contain invalid characters: '!*[]' ($*)"
     esac