Tutorial: do not use 'git resolve'.
[gitweb.git] / Documentation / merge-strategies.txt
2005-11-06 Refactor merge strategies into separate includable...