fail () { echo >&2 "$0: $*"; exit 127; }
case "$1" in
---v1) on=tip ;;
---base-v1) on=base ;;
+--v1) how=tip ;;
+--v1-base) how=base ;;
+--v1-dep) how=dep ;;
*) fail "bad usage" ;;
esac
markersize=$5
case $on.$whichfile in
-tip.msg)
- exec git-merge-file --marker-size=$markersize \
- "$current" "$ancestor" "$other"
+dep.msg|dep.deps|dep.flags)
+ touch "$current"
+ exit 0
;;
base.msg|base.deps)
echo '# not applicable' >"$current"
exit 0
;;
-*.included|tip.deps|tip.flags)
- exec topbloke-merge-lists "$current" "$ancestor" "$other"
- ;;
base.flags)
- exec topbloke-merge-lists -UDeleted \
+ exec topbloke-merge-lists -UDeleted "$current" "$ancestor" "$other"
+ ;;
+tip.msg)
+ exec git-merge-file --marker-size=$markersize \
"$current" "$ancestor" "$other"
;;
+tip.deps|tip.flags|*.included|*.pflags)
+ exec topbloke-merge-lists "$current" "$ancestor" "$other"
+ ;;
*)
fail "huh $on $whichfile ?"
;;