Skip to content

Instantly share code, notes, and snippets.

@STAR-ZERO

STAR-ZERO/p4diff

Created September 17, 2012 10:52
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save STAR-ZERO/3736678 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save STAR-ZERO/3736678 to your computer and use it in GitHub Desktop.
Download ZIP
gitでp4mergeを使うためのシェル
Raw
gistfile1.txt
参考：http://d.hatena.ne.jp/clover-leaf/20110126/1296058882
Raw
p4diff
#!/bin/sh
P4MERGE=/Applications/p4merge.app/Contents/MacOS/p4merge
[ $# -eq 7 ] && ${P4MERGE} "$2" "$
Raw
p4merge
#!/bin/sh
P4MERGE=/Applications/p4merge.app/Contents/MacOS/p4merge
${P4MERGE} $*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment