?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: ddc0c49) | patch
mergetool: Remove spurious error message if merge.tool config option not set
commitb7b36f92fd096d1ff0d4cccd8980c93c3bff4fa8
authorTheodore Ts'o <tytso@mit.edu>
Thu, 29 Mar 2007 13:46:31 +0000 (29 09:46 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 29 Mar 2007 16:29:48 +0000 (29 12:29 -0400)
tree45fc1e19dc2dc0af45265f7394af4ca0efdff7e4tree | snapshot (tar.gz zip)
parentddc0c49753001d2b5da4df7df2d42378c8c3a295commit | diff
mergetool: Remove spurious error message if merge.tool config option not set

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
git-mergetool.sh diff | blob | blame | history
Jonathan Nieder’s miscellaneous git branches