4 xxx new theory, new metadata, not yet done here
6 fail () { echo >&2 "$0: $*"; exit 127; }
9 --v1) how=same ;; # merge into tip from another tip of this patch
10 # or into base from another base of this patch
11 --v1-base) how=base ;; # merge into tip from a base of this patch
12 --v1-dep) how=dep ;; # merge into base from a dep's tip
13 *) fail "bad usage" ;;
22 set -- "$ours" "$ancestor" "$theirs"
24 case $on.$whichfile in
25 dep.msg|dep.deps|dep.props)
29 echo '# not applicable' >"$ours"
35 exec topbloke-merge-lists -M$markersize -P -UDeleted "$@"
38 exec git-merge-file --marker-size=$markersize "$@"
41 exec topbloke-merge-lists -M$markersize "$@"
44 exec topbloke-merge-lists -M$markersize -P "$@"
47 fail "huh $on $whichfile ?"