|
1 | | -// You can set a command like this |
2 | | -// "cmd": ["command", "$file1", "$file2"] |
3 | | - |
4 | | -// You can also include other command line parameters like this |
5 | | -// "cmd": ["command", "-parameter1", "-parameter2", "$file1", "$file2"] |
6 | | - |
7 | | -{ |
8 | | - // just uncomment one of the examples |
9 | | - // or write your own command |
10 | | - // NOTE: Copy/paste example below or write your own command in: Package Settings --> FileDiffs --> Settings - User |
11 | | - // This file will be overwritten if the package is updated. |
12 | | - |
13 | | - // The "command" argument is different depending on your system, for instance |
14 | | - // you might need to prefix /usr/local/bin, or use another explicit path. |
15 | | - |
16 | | - // opendiff (FileMerge) |
17 | | - // "cmd": ["opendiff", "$file1", "$file2"] |
18 | | - |
19 | | - // ksdiff (Kaleidoscope) |
20 | | - // "cmd": ["ksdiff", "$file1", "$file2"] |
21 | | - |
22 | | - // "open_in_sublime": false |
23 | | - // twdiff (Textwrangler) |
24 | | - // "cmd": ["twdiff", "$file1", "$file2"] |
25 | | - |
26 | | - // bbdiff (BBEdit) NOTE: Use example below if you receive error. |
27 | | - // "cmd": ["bbdiff", "$file1", "$file2"] |
28 | | - |
29 | | - // bbdiff (BBEdit) |
30 | | - // "cmd" ["/usr/local/bin/bbdiff", "$file1", "$file2"] |
31 | | - |
32 | | - // deltawalker (DeltaWalker) |
33 | | - // "cmd": ["deltawalker", "-nosplash", "$file1", "$file2"] |
34 | | - |
35 | | - // "trim_trailing_white_space_before_diff": false |
36 | | - // "expand_full_file_name_in_tab": false |
37 | | - // "apply_tempfile_changes_after_diff_tool": false |
38 | | - // "limit": 1000 |
39 | | -} |
| 1 | +// You can set a command like this |
| 2 | +// "cmd": ["command", "$file1", "$file2"] |
| 3 | + |
| 4 | +// You can also include other command line parameters like this |
| 5 | +// "cmd": ["command", "-parameter1", "-parameter2", "$file1", "$file2"] |
| 6 | + |
| 7 | +{ |
| 8 | + // just uncomment one of the examples |
| 9 | + // or write your own command |
| 10 | + // NOTE: Copy/paste example below or write your own command in: Package Settings --> FileDiffs --> Settings - User |
| 11 | + // This file will be overwritten if the package is updated. |
| 12 | + |
| 13 | + // The "command" argument is different depending on your system, for instance |
| 14 | + // you might need to prefix /usr/local/bin, or use another explicit path. |
| 15 | + |
| 16 | + // opendiff (FileMerge) |
| 17 | + // "cmd": ["opendiff", "$file1", "$file2"] |
| 18 | + |
| 19 | + // ksdiff (Kaleidoscope) |
| 20 | + // "cmd": ["ksdiff", "$file1", "$file2"] |
| 21 | + |
| 22 | + // "open_in_sublime": false |
| 23 | + // twdiff (Textwrangler) |
| 24 | + // "cmd": ["twdiff", "$file1", "$file2"] |
| 25 | + |
| 26 | + // bbdiff (BBEdit) NOTE: Use example below if you receive error. |
| 27 | + // "cmd": ["bbdiff", "$file1", "$file2"] |
| 28 | + |
| 29 | + // bbdiff (BBEdit) |
| 30 | + // "cmd" ["/usr/local/bin/bbdiff", "$file1", "$file2"] |
| 31 | + |
| 32 | + // deltawalker (DeltaWalker) |
| 33 | + // "cmd": ["deltawalker", "-nosplash", "$file1", "$file2"] |
| 34 | + |
| 35 | + // bcomp (Beyond Compare) |
| 36 | + // Install Beyond Compare Command Line Tools: |
| 37 | + // Beyond Compare > Install Command Line Tools |
| 38 | + "cmd": ["/usr/local/bin/bcomp", "$file1", "$file2"] |
| 39 | + |
| 40 | + // "trim_trailing_white_space_before_diff": false |
| 41 | + // "expand_full_file_name_in_tab": false |
| 42 | + // "apply_tempfile_changes_after_diff_tool": false |
| 43 | + // "limit": 1000 |
| 44 | +} |
0 commit comments