Files
git/Documentation
Junio C Hamano 3ea43bbe17 Merge branch 'jc/abort-ll-merge-with-a-signal'
When the external merge driver is killed by a signal, its output
should not be trusted as a resolution with conflicts that is
proposed by the driver, but the code did.

* jc/abort-ll-merge-with-a-signal:
  t6406: skip "external merge driver getting killed by a signal" test on Windows
  ll-merge: killing the external merge driver aborts the merge
2023-06-29 16:43:21 -07:00
..
2023-06-26 09:29:50 -07:00
2023-06-12 13:52:51 -07:00
2023-02-18 09:29:13 -08:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2022-10-25 15:44:18 -07:00
2023-06-12 13:52:51 -07:00
2022-02-02 14:50:09 -08:00
2023-05-06 14:32:20 -07:00
2021-09-28 10:31:02 -07:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2021-12-10 14:35:03 -08:00
2023-05-16 11:38:14 -07:00
2023-05-17 10:11:41 -07:00
2019-05-07 13:04:48 +09:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2019-10-21 12:02:39 +09:00