iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
improve conflink outdated detection
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index a763c22a03eb2d29db832a3eed473d322d4e9b11..42c811a6437f16b9e195b1fded71eb3516826efe 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-149,4
+149,8
@@
case $user in
;;
esac
+f=/a/bin/distro-setup/system-status
+if [[ -x $f ]]; then
+ $f _
+fi
echo 0 >~/.local/conflink