From: Shawn O. Pearce Date: Thu, 9 Oct 2008 17:19:23 +0000 (-0700) Subject: Merge branch 'mv/merge-refresh' X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=76c3fb1f844753c4186975a483943e1970b3c4e2;p=git.git Merge branch 'mv/merge-refresh' * mv/merge-refresh: builtin-merge: refresh the index before calling a strategy --- 76c3fb1f844753c4186975a483943e1970b3c4e2