chiark
/
gitweb
/
~ian
/
topbloke.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
working on updates for new theory/metadata
[topbloke.git]
/
topbloke-merge-driver
diff --git
a/topbloke-merge-driver
b/topbloke-merge-driver
index a3d199920bac4a2e952859b9562886aac5a94338..1c0017f2d42ddb1dbce74dc7e09a887a0c55c792 100755
(executable)
--- a/
topbloke-merge-driver
+++ b/
topbloke-merge-driver
@@
-1,6
+1,8
@@
#!/bin/sh
set -e
+xxx new theory, new metadata, not yet done here
+
fail () { echo >&2 "$0: $*"; exit 127; }
case "$1" in