Make cache entry comparison take the new "state" flag into account.
[git.git] / merge-tree.c
2005-04-16 Junio C Hamano[PATCH] Add '-z' to merge-tree.c
2005-04-14 Linus TorvaldsAdd "merge-tree" helper program. Maybe it's retarded...