forked from kiss-community/kiss
kiss-preferred: new utility
Added a new utility to list all current conflicts resolutions.
This commit is contained in:
parent
7df30fd9df
commit
03cf1f5bf7
7
contrib/kiss-preferred
Executable file
7
contrib/kiss-preferred
Executable file
@ -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
|
||||||
|
|
Loading…
Reference in New Issue
Block a user