Use consistent shell prompts and example style.
[git.git] / Documentation / merge-strategies.txt
2005-11-06 Jon LoeligerRefactor merge strategies into separate includable...