Skip to content

Instantly share code, notes, and snippets.

@henrik242

henrik242/p4merge

Last active January 5, 2023 22:23
Download ZIP

Revisions

  1. henrik242 revised this gist Mar 21, 2016. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion readme.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,5 +1,5 @@
    * Copy [p4merge](https://gist.github.com/henrik242/1510148/raw/p4merge) to /usr/local/bin/p4merge
    * Download [P4V.dmg](http://filehost.perforce.com/perforce/r15.2/bin.macosx107x86_64/) and copy p4merge.app to /Applications
    * Download [P4V.dmg](http://filehost.perforce.com/perforce/r15.2/bin.macosx107x86_64/) and copy P4Merge.app to /Applications
    * Configure Git:

    ```bash
  2. henrik242 revised this gist Mar 21, 2016. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion p4merge
    View file
    Original file line number Diff line number Diff line change
    @@ -1,5 +1,5 @@
    #!/bin/bash

    for arg; do [[ $arg = /* ]] || arg=$PWD/$arg; absargs+=("$arg"); done;
    /Applications/p4merge.app/Contents/Resources/launchp4merge "${absargs[@]}"
    /Applications/P4Merge.app/Contents/Resources/launchp4merge "${absargs[@]}"

  3. henrik242 revised this gist Mar 21, 2016. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion readme.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,5 +1,5 @@
    * Copy [p4merge](https://gist.github.com/henrik242/1510148/raw/p4merge) to /usr/local/bin/p4merge
    * Download [P4V.dmg](http://filehost.perforce.com/perforce/r14.1/bin.macosx106x86_64/) and copy p4merge.app to /Applications
    * Download [P4V.dmg](http://filehost.perforce.com/perforce/r15.2/bin.macosx107x86_64/) and copy p4merge.app to /Applications
    * Configure Git:

    ```bash
  4. henrik242 revised this gist Apr 4, 2014. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion readme.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,5 +1,5 @@
    * Copy [p4merge](https://gist.github.com/henrik242/1510148/raw/p4merge) to /usr/local/bin/p4merge
    * Download [P4V.dmg](http://filehost.perforce.com/perforce/r13.3/bin.macosx106x86_64/) and copy p4merge.app to /Applications
    * Download [P4V.dmg](http://filehost.perforce.com/perforce/r14.1/bin.macosx106x86_64/) and copy p4merge.app to /Applications
    * Configure Git:

    ```bash
  5. henrik242 revised this gist Oct 30, 2013. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion readme.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,5 +1,5 @@
    * Copy [p4merge](https://gist.github.com/henrik242/1510148/raw/p4merge) to /usr/local/bin/p4merge
    * Download [P4V.dmg](http://filehost.perforce.com/perforce/r13.2/bin.macosx106x86_64/) and copy p4merge.app to /Applications
    * Download [P4V.dmg](http://filehost.perforce.com/perforce/r13.3/bin.macosx106x86_64/) and copy p4merge.app to /Applications
    * Configure Git:

    ```bash
  6. henrik242 revised this gist Sep 18, 2013. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion readme.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,5 +1,5 @@
    * Copy [p4merge](https://gist.github.com/henrik242/1510148/raw/p4merge) to /usr/local/bin/p4merge
    * Download [P4V.dmg](http://filehost.perforce.com/perforce/r13.4/bin.macosx106x86_64/) and copy p4merge.app to /Applications
    * Download [P4V.dmg](http://filehost.perforce.com/perforce/r13.2/bin.macosx106x86_64/) and copy p4merge.app to /Applications
    * Configure Git:

    ```bash
  7. henrik242 revised this gist Sep 18, 2013. 1 changed file with 2 additions and 2 deletions.
    4 changes: 2 additions & 2 deletions readme.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,5 +1,5 @@
    * Copy [p4merge](https://raw.github.com/gist/1510148/p4merge) to /usr/local/bin/p4merge
    * Download [P4V.dmg](http://filehost.perforce.com/perforce/r13.1/bin.macosx106x86_64/) and copy p4merge.app to /Applications
    * Copy [p4merge](https://gist.github.com/henrik242/1510148/raw/p4merge) to /usr/local/bin/p4merge
    * Download [P4V.dmg](http://filehost.perforce.com/perforce/r13.4/bin.macosx106x86_64/) and copy p4merge.app to /Applications
    * Configure Git:

    ```bash
  8. henrik242 revised this gist Apr 24, 2013. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion readme.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,5 +1,5 @@
    * Copy [p4merge](https://raw.github.com/gist/1510148/p4merge) to /usr/local/bin/p4merge
    * Download P4Merge from http://www.perforce.com/downloads/Perforce-Software-Version-Management/complete_list/Customer%20Downloads and copy p4merge.app to /Applications
    * Download [P4V.dmg](http://filehost.perforce.com/perforce/r13.1/bin.macosx106x86_64/) and copy p4merge.app to /Applications
    * Configure Git:

    ```bash
  9. henrik242 revised this gist Apr 24, 2013. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion readme.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,5 +1,5 @@
    * Copy [p4merge](https://raw.github.com/gist/1510148/p4merge) to /usr/local/bin/p4merge
    * Download P4V from http://www.perforce.com/perforce/downloads/index.html and copy p4merge.app to /Applications
    * Download P4Merge from http://www.perforce.com/downloads/Perforce-Software-Version-Management/complete_list/Customer%20Downloads and copy p4merge.app to /Applications
    * Configure Git:

    ```bash
  10. henrik242 revised this gist Nov 22, 2012. 2 changed files with 1 addition and 1 deletion.
    Empty file modified p4merge
    100755 → 100644
    View file
    Empty file.
    2 changes: 1 addition & 1 deletion readme.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,4 +1,4 @@
    * Copy ```p4merge``` to /usr/local/bin/p4merge
    * Copy [p4merge](https://raw.github.com/gist/1510148/p4merge) to /usr/local/bin/p4merge
    * Download P4V from http://www.perforce.com/perforce/downloads/index.html and copy p4merge.app to /Applications
    * Configure Git:

  11. henrik242 revised this gist Feb 21, 2012. 1 changed file with 0 additions and 0 deletions.
    Empty file modified p4merge
    100644 → 100755
    View file
    Empty file.
  12. henrik242 revised this gist Jan 25, 2012. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion readme.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,4 +1,4 @@
    * Copy this file to /usr/local/bin/p4merge
    * Copy ```p4merge``` to /usr/local/bin/p4merge
    * Download P4V from http://www.perforce.com/perforce/downloads/index.html and copy p4merge.app to /Applications
    * Configure Git:

  13. henrik242 revised this gist Jan 25, 2012. 1 changed file with 13 additions and 0 deletions.
    13 changes: 13 additions & 0 deletions readme.md
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,13 @@
    * Copy this file to /usr/local/bin/p4merge
    * Download P4V from http://www.perforce.com/perforce/downloads/index.html and copy p4merge.app to /Applications
    * Configure Git:

    ```bash
    $ chmod 755 /usr/local/bin/p4merge
    $ git config --global merge.tool p4merge
    $ git config --global mergetool.prompt false
    $ git config --global mergetool.keepBackup false
    $ git config --global mergetool.p4merge.path /usr/local/bin/p4merge
    ```

    * ```git mergetool```and ```git difftool``` will launch p4merge now.
  14. henrik242 revised this gist Dec 22, 2011. 1 changed file with 0 additions and 12 deletions.
    12 changes: 0 additions & 12 deletions p4merge
    View file
    Original file line number Diff line number Diff line change
    @@ -3,15 +3,3 @@
    for arg; do [[ $arg = /* ]] || arg=$PWD/$arg; absargs+=("$arg"); done;
    /Applications/p4merge.app/Contents/Resources/launchp4merge "${absargs[@]}"


    # 1) Put this file in your $PATH and make it executable

    # 2) Download P4V from http://www.perforce.com/perforce/downloads/index.html and copy p4merge to /Applications

    # 3) Add the following to ~/.gitconfig:

    #[merge]
    # tool = p4merge
    #[mergetool]
    # prompt = false
    # keepBackup = false
  15. henrik242 created this gist Dec 22, 2011.
    17 changes: 17 additions & 0 deletions p4merge
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,17 @@
    #!/bin/bash

    for arg; do [[ $arg = /* ]] || arg=$PWD/$arg; absargs+=("$arg"); done;
    /Applications/p4merge.app/Contents/Resources/launchp4merge "${absargs[@]}"


    # 1) Put this file in your $PATH and make it executable

    # 2) Download P4V from http://www.perforce.com/perforce/downloads/index.html and copy p4merge to /Applications

    # 3) Add the following to ~/.gitconfig:

    #[merge]
    # tool = p4merge
    #[mergetool]
    # prompt = false
    # keepBackup = false