comparison hgext/extdiff.py @ 23151:733d980b9c59

extdiff: drop the command alias without options example in the help text In the dropped example, the extension would look for 'vdiff.diffargs' in the configuration, and not finding it, would run kdiff3 without the configured options. That's not obvious to a new user who sees a kdiff3 configuration in the prepackaged mergetools.rc file, and sees that kdiff3 still runs. While it is conceivable that the user wants a kdiff3 command that runs without the preconfigured options, it is more likely what they want is this, which uses the canned options: [alias] vdiff = kdiff3 [extdiff] kdiff3 = We could mention alias here, but that seems like it belongs elswhere.
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 02 Nov 2014 15:27:15 -0500
parents aff73c777b0b
children b8f6d840d3ec
comparison
equal deleted inserted replaced
23150:aff73c777b0b 23151:733d980b9c59
20 # add new command that runs GNU diff(1) in 'context diff' mode 20 # add new command that runs GNU diff(1) in 'context diff' mode
21 cdiff = gdiff -Nprc5 21 cdiff = gdiff -Nprc5
22 ## or the old way: 22 ## or the old way:
23 #cmd.cdiff = gdiff 23 #cmd.cdiff = gdiff
24 #opts.cdiff = -Nprc5 24 #opts.cdiff = -Nprc5
25
26 # add new command called vdiff, runs kdiff3
27 vdiff = kdiff3
28 25
29 # add new command called meld, runs meld (no need to name twice). If 26 # add new command called meld, runs meld (no need to name twice). If
30 # the meld executable is not available, the meld tool in [merge-tools] 27 # the meld executable is not available, the meld tool in [merge-tools]
31 # will be used, if available 28 # will be used, if available
32 meld = 29 meld =