Skip to content

Instantly share code, notes, and snippets.

@Taisho

Taisho/Git_mergetool_commands

Forked from RohanBhanderi/Git_mergetool_commands
Created March 13, 2024 12:16
Show Gist options
  • Save Taisho/2eadcbb93a8b38aa1444c7f20a4b8b6c to your computer and use it in GitHub Desktop.
Save Taisho/2eadcbb93a8b38aa1444c7f20a4b8b6c to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. Rohan Bhanderi renamed this gist Apr 23, 2015. 1 changed file with 0 additions and 0 deletions.
    0 Git_mergetool → Git_mergetool_commands
    View file
    File renamed without changes.
  2. Rohan Bhanderi created this gist Apr 23, 2015.
    10 changes: 10 additions & 0 deletions Git_mergetool
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,10 @@
    //Git Mergetool and difftool with Beyond Compare 4
    //For Windows
    //IF running this command in git bash then escape $ with \
    git config --global diff.tool bc4
    git config --global difftool.bc4.cmd "\"C:/Program Files (x86)/Beyond Compare 4/BCompare.exe\" \"\$LOCAL\" \"\$REMOTE\""
    git config --global difftool.prompt false

    git config --global merge.tool bc4
    git config --global mergetool.bc4.cmd "\"C:/Program Files (x86)/Beyond Compare 4/BCompare.exe\" \"\$LOCAL\" \"\$REMOTE\" \"\$BASE\" \"\$MERGED\""
    git config --global mergetool.bc4.trustExitCode true