@matheusbsbs / matheus-bagliano / commits / 66a6a31420
Fork 0

Merge branch 'mz/rerere-remaining'

* mz/rerere-remaining: mergetool: don't skip modify/remove conflicts rerere "remaining"

Junio C Hamano committed Feb 27, 2011 at 21:58 UTC 66a6a3142074473c91eb7f11de4d745647d43540

No changes.