@matheusbsbs / matheus-bagliano / commits / ebcffb1d44
Fork 0

Merge branch 'js/merge-rr'

* js/merge-rr: Move MERGE_RR from .git/rr-cache/ into .git/ Conflicts: builtin-rerere.c

Junio C Hamano committed Jul 14, 2008 at 23:48 UTC ebcffb1d44643bab69671abdf79209489e64dbef

No changes.