Merge http://www.kernel.org/pub/scm/gitk/gitk
[gitweb.git] / Documentation / merge-strategies.txt
2005-11-20 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-19 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-06 Refactor merge strategies into separate includable...