4 fail () { echo >&2 "$0: $*"; exit 127; }
7 --v1) how=same ;; # merge into tip from another tip of this patch
8 # or into base from another base of this patch
9 --v1-base) how=base ;; # merge into tip from a base of this patch
10 --v1-dep) how=dep ;; # merge into base from a dep's tip
11 *) fail "bad usage" ;;
20 set -- "$ours" "$ancestor" "$theirs"
22 case $on.$whichfile in
23 dep.msg|dep.deps|dep.props)
27 echo '# not applicable' >"$ours"
33 exec topbloke-merge-lists -M$markersize -P -UDeleted "$@"
36 exec git-merge-file --marker-size=$markersize "$@"
39 exec topbloke-merge-lists -M$markersize "$@"
42 exec topbloke-merge-lists -M$markersize -P "$@"
45 fail "huh $on $whichfile ?"