| commit | a5834b775b233d61b71927e1e0b98d2372406492 | |
| author | Elijah Newren <newren@gmail.com> | |
| Thu, 18 Aug 2022 07:15:25 +0000 (18 07:15 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Aug 2022 16:49:30 +0000 (18 09:49 -0700) | ||
| tree | 4e36c1090f4b839e48354af821acf2e95b3eba0f | treesnapshot (tar.gz zip) |
| parent | 4057523a4061092e9181220d54dca9eadcb75bdc | commitdiff |
merge-ort: remove translator lego in new "submodule conflict suggestion"
In commit 4057523a40 ("submodule merge: update conflict error message",
2022-08-04), the new "submodule conflict suggestion" code was
translating 6 different pieces of the new message and then used
carefully crafted logic to allow stitching it back together with special
formatting. Keep the components of the message together as much as
possible, so that:
* we reduce the number of things translators have to translate
* translators have more control over the format of the output
* the code is much easier for developers to understand too
Also, reformat some comments running beyond the 80th column while at it.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
In commit 4057523a40 ("submodule merge: update conflict error message",
2022-08-04), the new "submodule conflict suggestion" code was
translating 6 different pieces of the new message and then used
carefully crafted logic to allow stitching it back together with special
formatting. Keep the components of the message together as much as
possible, so that:
* we reduce the number of things translators have to translate
* translators have more control over the format of the output
* the code is much easier for developers to understand too
Also, reformat some comments running beyond the 80th column while at it.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-ort.c | diffblobblamehistory |