projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9cec653) | patch
mergetool: print an appropriate warning if merge.tool is unknown
authorTheodore Ts'o <tytso@mit.edu>
Mon, 19 Mar 2007 02:30:10 +0000 (22:30 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 19 Mar 2007 02:30:10 +0000 (22:30 -0400)
commitd6678c28e30e836449092a2917d4b0bd6254b06c
treef12f255eac19900b6c2ca2fe54dcc604cd00bb27tree | snapshot
parent9cec65399d3575774910b21c1cfd762a5e88a245commit | diff
mergetool: print an appropriate warning if merge.tool is unknown

Also add support for vimdiff

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
git-mergetool.sh diff | blob | history
Git—the stupid content tracker