Merge branch 'js/merge-rr'
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Jul 2008 06:48:48 +0000 (23:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Jul 2008 06:56:27 +0000 (23:56 -0700)
commitebcffb1d44643bab69671abdf79209489e64dbef
treed451abfc0dad9e9f3c45eb3cdc247d1dc3f81710
parent1864265c4d9afa374b27836ff0a3b3eb40144552
parent0af0ac7ebbbd2afbc4399d5658e193460b4caaa3
Merge branch 'js/merge-rr'

* js/merge-rr:
  Move MERGE_RR from .git/rr-cache/ into .git/

Conflicts:
builtin-rerere.c
rerere.c