diff-cache: fix handling of unmerged files.
[git] / merge-cache.c
2005-04-24  James Bottomley[PATCH] make file merging respect permissions
2005-04-18  Linus TorvaldsChange merge-cache and git-merge-one-file to use the...
2005-04-18  Linus TorvaldsMerge the new object model thing from Daniel Barkalow
2005-04-18  Linus TorvaldsAss a "merge-cache" helper program to execute a merge on