Code

Merge branch 'js/merge-rr-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Jul 2010 19:08:36 +0000 (12:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Jul 2010 19:08:36 +0000 (12:08 -0700)
* js/merge-rr-fix:
  MERGE_RR is in .git, not .git/rr-cache

1  2 
builtin/rerere.c

Simple merge