iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
mostly fixes, a few improvements
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index 855014377e8c74edc177e8906eede0787946d1d8..d661e172dfd5a5b1d2f5790236221dfc59f62232 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-1,6
+1,6
@@
#!/bin/bash
-source /a/bin/
errhandle/er
r
+source /a/bin/
bash-bear-trap/bash-bea
r
err-cleanup() {
echo 1 >~/.local/conflink
}