]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ffe702b) | patch
merge-ort: remove debugging crud
authorElijah Newren <newren@gmail.com>
Mon, 3 Nov 2025 18:01:47 +0000 (18:01 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Nov 2025 22:08:08 +0000 (14:08 -0800)
commitd5663a4b05640a44aa52a0cc32ba6a601d7c9149
tree7105178ce0183e7183c1dfe3f3491f5c472330b9tree | snapshot
parentffe702b3edf85aa924d685a8603205d47e94e851commit | diff
merge-ort: remove debugging crud

While developing commit a16e8efe5c2b (merge-ort: fix
merge.directoryRenames=false, 2025-03-13), I was testing things out and
had an extra condition on one of the if-blocks that I occasionally
swapped between '&& 0' and '&& 1' to see the effects of the changes.  I
forgot to remove it before submitting and it wasn't caught in review.
Remove it now.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-ort.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.