combine-diff: better hunk splitting.
[gitweb.git] / Documentation / merge-strategies.txt
2005-12-12 GIT 0.99.9m aka 1.0rc5 v0.99.9mv1.0rc5
2005-12-08 Documentation: recursive is the default strategy these...
2005-12-07 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-29 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-28 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-22 Merge http://www.kernel.org/pub/scm/gitk/gitk
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-07 GIT 0.99.9e v0.99.9e
2005-11-06 Refactor merge strategies into separate includable...