{"thread":{"id":"62989","subject":"git-bugreport-2025-02-21-1642","startedAt":"2025-02-21T22:03:17Z","lastAt":"2025-02-21T22:03:17Z","messageCount":1,"participants":["Yurii Kartsev"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"512864","messageId":"6799803c-f782-414a-9599-5baf6cb879ff@gmail.com","threadId":"62989","inReplyTo":null,"subject":"git-bugreport-2025-02-21-1642","fromName":"Yurii Kartsev","fromEmail":"jpro.wrk@gmail.com","sentAt":"2025-02-21T22:03:10Z","receivedAt":"2025-02-21T22:03:17Z","isPatch":false,"sender":{"key":"jpro.wrk@gmail.com","avatar":null},"body":"Dear Git Team!\n\nMy name is Yury. Please find a bug report attached. Basically, \"git \ndiff\" hides one of the differences during merge. Everything, including a \nsample repository is there in order to reproduce.\n\nI'm using git version 2.39.5 (Apple Git-154), as part of XCode in the \nlatest macOS. Could not test in the latest version because could not \nbuild it locally (due to some gettext issues that I could not overcome, \nbecause building gettext locally also failed).\n\nAdding contents of the \"git-bugreport-2025-02-21-1642.txt\" below. Thank \nyou in advance!\n\n------ git-bugreport-2025-02-21-1642.txt:\n\nThank you for filling out a Git bug report!\nPlease answer the following questions to help us understand your issue.\n\nWhat did you do before the bug happened? (Steps to reproduce your issue)\n\n1. Merge branch 'branch' into 'main' by being in branch 'main' and \ntyping 'git merge branch'.\n2. Run 'git diff'.\n3. Observe 2 diffs, both related to the conflict, but one diff is \nmissing (changes from commit \"Version update\").\n4. Run 'git add pom.xml'\n5. Run 'git diff --cached'\n6. Observe changes from commit \"Version update\" being shown now.\n\nWhat did you expect to happen? (Expected behavior)\n\nChanges from commit \"Version update\" should have been displayed in the \nfirst 'git diff'.\n\nWhat happened instead? (Actual behavior)\n\nChanges from commit \"Version update\" were not displayed in the first \n'git diff', but only after staging pom.xml and typing 'git diff --cached'\n\nWhat's different between what you expected and what actually happened?\n\nChanges from commit \"Version update\" are missing in first \"git diff\" output.\n\nAnything else you want to add:\n\nPlease see attached history.txt for observing terminal output. Also \nattaching an example repository in folder \"git-bug-merge\" which you can \nuse to reproduce the issue. Just follow the steps to reproduce from above.\n\nPlease review the rest of the bug report below.\nYou can delete any lines you don't wish to share.\n\n\n[System Info]\ngit version:\ngit version 2.39.5 (Apple Git-154)\ncpu: arm64\nno commit associated with this build\nsizeof-long: 8\nsizeof-size_t: 8\nshell-path: /bin/sh\nfeature: fsmonitor--daemon\nuname: Darwin 24.3.0 Darwin Kernel Version 24.3.0: Thu Jan  2 20:24:16 \nPST 2025; root:xnu-11215.81.4~3/RELEASE_ARM64_T6000 arm64\ncompiler info: clang: 16.0.0 (clang-1600.0.26.6)\nlibc info: no libc information available\n$SHELL (typically, interactive shell): /bin/bash\n\n\n[Enabled Hooks]\n"}]}