Git has a better merge here, but that's due to better hunk handling/hunk splitting. We, however, consistently use +x
