rebase on pull when updating the openbsd branch
this avoids inadvertent local merges
This commit is contained in:
parent
00b51d5c25
commit
d6a485d1a1
this avoids inadvertent local merges