X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=conflink;h=0dffc229e80b1b662c75fc8a0a6098008efebb88;hp=bbe13126750cddb64e67a636fefeacc2291021a7;hb=6f1f8a104c9b38936ade2d27e835479523985133;hpb=1a9542b37443a84e55e175db8ddef4e99f434fb5 diff --git a/conflink b/conflink index bbe1312..0dffc22 100755 --- a/conflink +++ b/conflink @@ -2,13 +2,28 @@ source /a/bin/errhandle/err + +usage() { + cat <