Test merges? Use rerere.