arrow

ARROW-6915: [Developer] Do not overwrite point release fix versions with merge tool

Many times it has happened that a manually set Fix Version for a patch release got overwritten by the default behavior of the merge tool (which sets the Fix Version to the next major / non-patch release by default), and someone has had to go back and manually add the patch release version again. This ensure that the merge tool does not do this to save maintainers time and effort

Closes #6708 from wesm/ARROW-6915

Authored-by: Wes McKinney <wesm+git@apache.org>
Signed-off-by: Wes McKinney <wesm+git@apache.org>