merge-one-file: use empty- or common-base condintionally in two-stage merge.
[gitweb.git] / Documentation / merge-options.txt
2005-11-07 Refactored merge options into separate merge-options...