diff options
author | Theodore Ts'o <tytso@mit.edu> | 2007-03-18 22:30:10 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2007-03-18 22:30:10 -0400 |
commit | d6678c28e30e836449092a2917d4b0bd6254b06c (patch) | |
tree | f12f255eac19900b6c2ca2fe54dcc604cd00bb27 /diff-delta.c | |
parent | 9cec65399d3575774910b21c1cfd762a5e88a245 (diff) | |
download | git-d6678c28e30e836449092a2917d4b0bd6254b06c.tar.gz |
mergetool: print an appropriate warning if merge.tool is unknown
Also add support for vimdiff
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'diff-delta.c')
0 files changed, 0 insertions, 0 deletions