[PATCH] New option to choose fast-forwarding on merge (take 2)

[Aaron Bentley]

Aaron Bentley has voted -0.
Status is now: Semi-approved
Comment:
I think this option entices our users into dangerous waters.

For details, see: http://bundlebuggy.aaronbentley.com/request/%3C20061125204030.GA15284%40efreet.light.src%3E