Merge http://www.kernel.org/pub/scm/gitk/gitk
[git.git] / Documentation / merge-strategies.txt
2005-11-22 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-20 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-19 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-06 Jon LoeligerRefactor merge strategies into separate includable...