Merge branch 'jc/subdir'

diff --cc git-diff.sh
index 7baf7044e440e6d052f5e92e1008f710dd319c67,e45f50ec224d2b0ee23780a00dd351746665a9a2..b62e58341cd9d11fc893613949426126871531e2
--- 1/git-diff.sh
--- 2/git-diff.sh
+++ b/git-diff.sh
@@@ -7,6 -7,13 +7,11 @@@ rev=$(git-rev-parse --revs-only --no-fl
  flags=$(git-rev-parse --no-revs --flags --sq "$@")
  files=$(git-rev-parse --no-revs --no-flags --sq "$@")
  
 -: ${flags:="'-M' '-p'"}
 -
+ die () {
+     echo >&2 "$*"
+     exit 1
+ }
+ 
  # I often say 'git diff --cached -p' and get scolded by git-diff-files, but
  # obviously I mean 'git diff --cached -p HEAD' in that case.
  case "$rev" in

diff --cc http-push.c
Simple merge

diff --cc setup.c
Simple merge