chezmoi merge not showing all modifications in 3-way merge tool

[rcdailey]

Environment

• chezmoi version: v2.62.7, commit 6384ea3, built at 2025-06-22T20:18:56Z, built by Homebrew
• OS: macOS
• Merge tool: Beyond Compare (configured via .chezmoi.toml)

Configuration

My .chezmoi.toml has:

[merge]
    command = "bcomp"
    args = [
        "{{ .Destination }}",
        "{{ .Source }}", 
        "{{ .Target }}",
    ]

Issue Description

I have changes in both my chezmoi source file and my target file, but both chezmoi diff and chezmoi merge are only showing changes in one direction.

What I expected

Since I have modifications in both files, I expected to see:

• Deletions from target file (red - lines)
• Additions to target file (green + lines)
• Both sides showing changes in the merge tool

What actually happened

Both chezmoi diff and Beyond Compare merge tool only show deletions:

-## Code Block Standards
-
-- Fenced code blocks must always specify a language after the opening three backticks. If no language is needed, use `txt` as the language.

No additions (+ lines) appear, even though I believe I have changes in both the source and target files.

Status output

$ chezmoi status
MM .claude/CLAUDE.md

Questions

1. Why are only deletions shown when I have changes in both files? Should chezmoi diff show bidirectional changes?

2. Is the MM status indicating that both files have been modified, and if so, why don't I see additions in the diff output?

3. How should chezmoi merge handle the case where both source and target files have been independently modified?

Workaround

Currently using chezmoi diff to see all changes and then chezmoi apply to apply them, but would prefer to use the merge tool for a more visual review process.

[rcdailey]

At some point, I got confused. I clearly remember both files being modified at one point, but now checking again only one contains additions over the other. I'm not sure what I did. But it's clear my post is misleading at this point.

Sorry for the confusion. I'll resolve this post since I don't think I need an answer anymore. If I run into this issue again I'll start another post.