git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b3d7a52)
merge-recursive: fix unclear and outright wrong comments
authorElijah Newren <redacted>
Sun, 2 Aug 2020 03:14:27 +0000 (03:14 +0000)
committerJunio C Hamano <redacted>
Sun, 2 Aug 2020 18:03:57 +0000 (11:03 -0700)
commit56e743426b183d8aea8f4caa363e7f3c7da27278
treee06beda6ab86dd1c9bf913c1acfeb6099e48c37atree | snapshot
parentb3d7a52fac39193503a0b6728771d1bf6a161464commit | diff
merge-recursive: fix unclear and outright wrong comments

Commits 7c0a6c8e47 ("merge-recursive: move some definitions around to
clean up the header", 2019-08-17), and b4db8a2b76 ("merge-recursive:
remove useless parameter in merge_trees()", 2019-08-17) added some
useful documentation to the functions, but had a few places where the
new comments were unclear or even misleading.  Fix those comments.

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-recursive.c diff | blob | history
merge-recursive.h diff | blob | history
git clone https://git.99rst.org/PROJECT