rerere(category30-tips-tricks-fragen.html) - phpMan

git-rerere (1)       - Reuse recorded resolution of conflicted merges