Merge branch 'js/merge-rr-fix'
* js/merge-rr-fix: MERGE_RR is in .git, not .git/rr-cache
Junio C Hamano committed
Jul 15, 2010 at 12:08 UTC
4bd874c8f30d55b6189dacf1d769855ed2df4299
No changes.
* js/merge-rr-fix: MERGE_RR is in .git, not .git/rr-cache
No changes.