Three-way merge: fix silly bug that made trivial merges not work
[git] / index.c
2005-05-19  Junio C Hamano[PATCH] Implement git-checkout-cache -u to update stat...