From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Jul 2010 19:08:36 +0000 (-0700)
Subject: Merge branch 'js/merge-rr-fix'
X-Git-Tag: v1.7.2~18
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=4bd874c8f30d55b6189dacf1d769855ed2df4299

Merge branch 'js/merge-rr-fix'

* js/merge-rr-fix:
  MERGE_RR is in .git, not .git/rr-cache
---

4bd874c8f30d55b6189dacf1d769855ed2df4299