s/checkout-cache/checkout-index/g for Documentation/git-ls-files.txt
[gitweb.git] / git-merge-resolve.sh
2005-10-03 [PATCH] Enable and fix support for base less merges.
2005-09-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-11 Use Daniel's read-tree in the merge strategy 'resolve'.
2005-09-11 Multi-backend merge driver.