Refactored merge options into separate merge-options.txt.
[git.git] / Documentation / merge-options.txt
2005-11-07 Jon LoeligerRefactored merge options into separate merge-options...