diff options
| author | Elijah Newren <newren@gmail.com> | 2022-06-18 00:20:51 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-22 16:10:06 -0700 |
| commit | a4040cfa35d8781df3e994380d1b559be8b22bd2 (patch) | |
| tree | d6b8ebcb556a2311f185ee2c8878eaeea59baf17 /gitweb | |
| parent | merge-ort: provide a merge_get_conflicted_files() helper function (diff) | |
| download | git-a4040cfa35d8781df3e994380d1b559be8b22bd2.tar.gz git-a4040cfa35d8781df3e994380d1b559be8b22bd2.zip | |
merge-ort: remove command-line-centric submodule message from merge-ort
There was one case in merge-ort that would call path_msg() multiple
times for the same logical conflict, and it was in order to give advice
about how to resolve a conflict. This advice does not make as much
sense with remerge-diff, or with merge-tree being invoked by a GitHub
GUI for resolution of messages, and is making it hard to provide
which-logical-conflict-affects-which-paths information in a machine
parseable way to a higher level caller of merge-tree. Let's simply
remove this informational message.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitweb')
0 files changed, 0 insertions, 0 deletions