The merge tool that understands your code

Support git mergetool/difftool with --dir-diff option - multiple files at once

SemanticMerge opens up files one at a time when I issue git difftool/mergetool commands. This is a pain since with several files when the context is important and moving back and forth between files is often necessary. Git's option --dir-diff was designed to address this - but it doesn't work with SemanticMerge. Beyond Compare supports this and as such I find myself using it more, much as I prefer the SemanticMerge UI.

19 votes
Vote
Sign in
(thinking…)
Sign in with: Facebook Google
Signed in as (Sign out)
You have left! (?) (thinking…)
James World shared this idea  ·   ·  Flag idea as inappropriate…  ·  Admin →

4 comments

Sign in
(thinking…)
Sign in with: Facebook Google
Signed in as (Sign out)
Submitting...
  • Mattias Karlsson commented  ·   ·  Flag as inappropriate

    +3 on this!

    Doesn't need to be an super fancy UI, just the gain to just launch the tool once instead of each file in large diffs would be a huge time saver.

    Shouldn't be super hard, basically what "git difftool" with the "--dir-diff" option does is that it copies only the files to a new temporary directory, something like:
    C:\Users\[user]\AppData\Local\Temp\git-difftool.[temp id]

    In that directory there's a left and a right directory containing just the changed files before and after, it also contains 2 git index files, but the directories should be enough.

    So if SM could find all files in left, find all files in right, missing files treated as empty, then present a list/tree and let me switch between files to diff, well taht would make the tool allot more efficient.

    On large diffs today it's really frustrating to open/close app for each file.

  • psantosl commented  ·   ·  Flag as inappropriate

    Hi James,

    It is a good option to add.

    I've been checking it with the team today. We'll try to work on it on a couple of weeks.

Feedback and Knowledge Base