fail () { echo >&2 "$0: $*"; exit 127; }
case "$1" in
---v1) how=tip ;; # merge into tip from another tip of this patch
+--v1) how=same ;; # merge into tip from another tip of this patch
+ # or into base from another base of this patch
--v1-base) how=base ;; # merge into tip from a base of this patch
--v1-dep) how=dep ;; # merge into base from a dep's tip
*) fail "bad usage" ;;
base.props)
exec topbloke-merge-lists -M$markersize -P -UDeleted "$@"
;;
-tip.msg)
+same.msg)
exec git-merge-file --marker-size=$markersize "$@"
;;
-tip.deps|*.included)
+same.deps|*.included)
exec topbloke-merge-lists -M$markersize "$@"
;;
-tip.props|*.pprops)
+same.props|*.pprops)
exec topbloke-merge-lists -M$markersize -P "$@"
;;
*)