Re: "git-merge": allow fast-forwarding in a stat-dirty tree

On Wed, Aug 20, 2008 at 03:09:28PM -0700, Junio C Hamano [off-list ref] wrote:

 	if (read_cache_unmerged())
 		die("you need to resolve your current index first");
+	refresh_cache(REFRESH_QUIET);

I did not realise that we need a refresh_cache() after
read_cache_unmerged() here, and thus the other refresh_cache() call is
unnecessary.

Thanks.