Merge diff shows locally changed files

[pmahend1]

Local uncommitted and/or unstaged files also show up in Git Tree Compare in Merge Diff mode . I looked if there is any setting which would change it, there isn't. I tried toggling gitTreeCompare.diffMode but it doesn't change it.

[letmaik]

That's by design. Are you asking for a new feature to disable this?

[pmahend1]

If it is possible to implement it without having to stash changes that would be great. If not possible feel free to close this request.

[letmaik]

Omitting uncommitted (untracked) files would be easy, this just means not running git ls-files -z --others --exclude-standard. Ignoring unstaged changes would mean adding the --cached flag to the main diff command git diff-index -z --find-renames. Both fairly easy to do, the rest of the work would just be exposing it optionally under some config option. Do you want to have a go at it?

[pmahend1]

I will give it try, will let you know if I need help.