Files
Junio C Hamano 0f8e75abeb Revert "Merge branch 'en/no-amend-during-conflicts'"
This reverts commit a334b7ec86,
reversing changes made to cee3798cb4,
as we found a regression and decided to give ourselves a chance to
fix it better after Git 2.56 final.

  cf. https://lore.kernel.org/git/xmqqik3vc1pc.fsf@gitster.g/
2026-09-23 11:18:51 -07:00
..
2025-06-15 21:54:23 -07:00
2025-06-15 21:54:23 -07:00
2025-06-15 21:54:23 -07:00
2025-06-15 21:54:23 -07:00
2025-06-15 21:54:23 -07:00
2025-06-15 21:54:23 -07:00
2025-03-12 12:06:58 -07:00
2025-06-15 21:54:23 -07:00
2025-06-13 13:29:15 -07:00
2025-06-15 21:57:08 -07:00
2025-08-07 08:48:57 -07:00
2025-10-15 10:29:35 -07:00
2025-10-26 19:48:21 -07:00
2025-11-17 07:35:33 -08:00
2026-02-01 18:07:39 -08:00
2026-05-21 12:42:11 +09:00