Version Control System integration

Starting from version 1.1.6, the DiffFork command-line utility supports OPTION "-w --wait", which can be used to help work with Bazaar, Git, Mercurial, Subversion, etc.

Note: DiffFork can compare 2 folders/files. 3-way diff/merge is not supported.

To install the command-line utility, choose "Install Command-Line Utility..." from the Help menu.

  USAGE
    difffork file1 file2 [OPTION]
  DESCRIPTION
    -w --wait
       Wait for the diff window to be closed.

The integration instructions provided in this document is a starting point. For more information, please reference the VCS document or contact us for support.

Bazaar

Tips:

Git

Mercurial

Mercurial has a detail instruction on how to use external programs to compare revisions, or revision with working dir: http://mercurial.selenic.com/wiki/ExtdiffExtension

To use extdiff command:

To create custom extdiff commands:

Subversion

Subversion has an instruction on how to use external programs: http://svnbook.red-bean.com/en/1.5/svn.advanced.externaldifftools.html