Skip to content

Instantly share code, notes, and snippets.

@willis7

willis7/WinMerge_TortoiseGit.md

Created May 21, 2014 20:16
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save willis7/ce22475f108d3dfecdbf to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save willis7/ce22475f108d3dfecdbf to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. Brice Lambson revised this gist Mar 19, 2012. 1 changed file with 2 additions and 2 deletions.
    4 changes: 2 additions & 2 deletions WinMerge_TortoiseGit.md
    View file
    Original file line number Diff line number Diff line change
    @@ -3,11 +3,11 @@ Open TortoiseGit > Settings, and click on Diff Viewer.
    Under the *Configure the program used for comparing different revisions of files* section, select External, and add the following into the text box.

    ```
    "C:\Program Files (x86)\WinMerge\WinMergeU.exe" /r /e /x /u /wl %base %mine
    WinMergeU.exe /r /e /x /u /wl %base %mine
    ```

    Click on Merge Tool to the left, select External, enter the following.

    ```
    "C:\Program Files (x86)\WinMerge\WinMergeU.exe" /e /x /wl /u %theirs %mine %merged
    WinMergeU.exe /e /u %merged
    ```
  2. Brice Lambson created this gist Mar 16, 2012.
    13 changes: 13 additions & 0 deletions WinMerge_TortoiseGit.md
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,13 @@
    Open TortoiseGit > Settings, and click on Diff Viewer.

    Under the *Configure the program used for comparing different revisions of files* section, select External, and add the following into the text box.

    ```
    "C:\Program Files (x86)\WinMerge\WinMergeU.exe" /r /e /x /u /wl %base %mine
    ```

    Click on Merge Tool to the left, select External, enter the following.

    ```
    "C:\Program Files (x86)\WinMerge\WinMergeU.exe" /e /x /wl /u %theirs %mine %merged
    ```