CityApper/dulwich

kopia lustrzana https://github.com/jelmer/dulwich

Autor	SHA1 Wiadomość	Data
Jelmer Vernooĳ	1d43ab79bf Add end-to-end tests for rerere with real merge operations	2 miesięcy temu
Jelmer Vernooĳ	fc9633a6b7 Implement rerere automatic resolution application	2 miesięcy temu
Jelmer Vernooĳ	7860f08008 Implement rerere automatic conflict recording	2 miesięcy temu
Jelmer Vernooĳ	d2fce476c4 Add basic rerere (reuse recorded resolution) functionality	2 miesięcy temu