Skip to content

Instantly share code, notes, and snippets.

@alecjacobson

alecjacobson/filemerge

Created August 7, 2025 18:37
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save alecjacobson/0020bf26df046e3d75ea1fa55860cf44 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save alecjacobson/0020bf26df046e3d75ea1fa55860cf44 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. alecjacobson created this gist Aug 7, 2025.
    7 changes: 7 additions & 0 deletions filemerge
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,7 @@
    #!/bin/sh

    # https://stackoverflow.com/questions/13719122/how-to-use-opendiff-as-default-mergetool/36841553#36841553
    # https://apple.stackexchange.com/questions/476348/use-apples-filemerge-from-command-line-and-have-it-wait-instead-of-exiting-imme
    file1=$(readlink -f "$1")
    file2=$(readlink -f "$2")
    open -a FileMerge -n -W --args -left "$file1" -right "$file2"