| Автор | SHA1 Сообщение | Дата |
|---|---|---|
|
|
1d43ab79bf Add end-to-end tests for rerere with real merge operations | 2 месяцев назад |
|
|
fc9633a6b7 Implement rerere automatic resolution application | 2 месяцев назад |
|
|
7860f08008 Implement rerere automatic conflict recording | 2 месяцев назад |
|
|
d2fce476c4 Add basic rerere (reuse recorded resolution) functionality | 2 месяцев назад |