| commit | d6678c28e30e836449092a2917d4b0bd6254b06c | |
| author | Theodore Ts'o <tytso@mit.edu> | |
| Mon, 19 Mar 2007 02:30:10 +0000 (18 22:30 -0400) | ||
| committer | Theodore Ts'o <tytso@mit.edu> | |
| Mon, 19 Mar 2007 02:30:10 +0000 (18 22:30 -0400) | ||
| tree | f12f255eac19900b6c2ca2fe54dcc604cd00bb27 | treesnapshot (tar.gz zip) |
| parent | 9cec65399d3575774910b21c1cfd762a5e88a245 | commitdiff |
mergetool: print an appropriate warning if merge.tool is unknown
Also add support for vimdiff
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Also add support for vimdiff
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
| git-mergetool.sh | diffblobblamehistory |