author | Theodore Ts'o <tytso@mit.edu> | |
Thu, 29 Mar 2007 13:46:31 +0000 (09:46 -0400) | ||
committer | Theodore Ts'o <tytso@mit.edu> | |
Thu, 29 Mar 2007 16:29:48 +0000 (12:29 -0400) | ||
commit | b7b36f92fd096d1ff0d4cccd8980c93c3bff4fa8 | |
tree | 45fc1e19dc2dc0af45265f7394af4ca0efdff7e4 | tree | snapshot |
parent | ddc0c49753001d2b5da4df7df2d42378c8c3a295 | commit | diff |
mergetool: Remove spurious error message if merge.tool config option not set
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
git-mergetool.sh | diff | blob | history |