Optionally use user-specified merge base.
Workaround for autocrlf problem.