Home/ Questions/Q 229465
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-11T19:46:05+00:00

I have FileA in branchA and FileB in branchB. The problem is that I

  • 0

I have FileA in branchA and FileB in branchB.

The problem is that I can access only one file at time.
I would like to be able to compare the files by FileMerge or meld, since they are the only diffTools whichI have found for Mac.

How can you diff by meld/FileMerge the two files?

[Solved]: 1st developed Problem: FileMerge does not allow standard input

Masi: You can use opendiff to allow FileMerge to have files from standard input. So the next problem is to find how to make git’s diff tool to use opendiff.

2nd developed Problem: to make Git’s diff tool to use opendiff in Mac

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    You can use “git mergetool” for merging, and in modern git (meaning version 1.6.3 and later) “git difftool” for comparing using graphical tools. Of course you would have to configure them first, but they do some autodetection (with some hardcoded preference, of course), and if I remember correctly opendiff support is built in.

    And then of course you would be able to use your graphical tool (opendiff / FileMerge) as you would use ordinary “git diff”, for example

    prompt> git difftool somebranch:UNREADME otherbranch:README
    • 0