templates / this--descriptionon commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1Unnamed repository; edit this file 'description' to name the repository.