4 fail () { echo >&2 "$0: $*"; exit 127; }
18 case $on.$whichfile in
20 exec git-merge-file --marker-size=$markersize \
21 "$current" "$ancestor" "$other"
24 echo '# not applicable' >"$current"
27 *.included|tip.deps|tip.flags)
28 exec topbloke-merge-lists "$current" "$ancestor" "$other"
31 exec topbloke-merge-lists -UDeleted \
32 "$current" "$ancestor" "$other"
35 fail "huh $on $whichfile ?"