rerere

Also written: rerere.enabled

"Reuse recorded resolution": Git remembers how you resolved a conflict and applies the same fix if it appears again.