From 7df30fd9df82d5e38e72a7f59ccaed40e6d22138 Mon Sep 17 00:00:00 2001
From: Arthur Williams <taaparthur@gmail.com>
Date: Sat, 7 Nov 2020 04:19:24 -0600
Subject: [PATCH 1/2] Allow '[' and ']' for kiss owns

Allow commands like `kiss own /usr/bin/\[` to succeed
---
 kiss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kiss b/kiss
index 0bba49e..ce514ca 100755
--- a/kiss
+++ b/kiss
@@ -1441,7 +1441,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
 

From 03cf1f5bf73915a17667b0a9142a08db063d626e Mon Sep 17 00:00:00 2001
From: Arthur Williams <taaparthur@gmail.com>
Date: Sat, 7 Nov 2020 04:27:57 -0600
Subject: [PATCH 2/2] kiss-preferred: new utility

Added a new utility to list all current conflicts resolutions.
---
 contrib/kiss-preferred | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100755 contrib/kiss-preferred

diff --git a/contrib/kiss-preferred b/contrib/kiss-preferred
new file mode 100755
index 0000000..49dcbdd
--- /dev/null
+++ b/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
+