From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 29 Mar 2007 13:46:31 +0000 (-0400)
Subject: mergetool: Remove spurious error message if merge.tool config option not set
X-Git-Tag: v1.5.1~19^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b7b36f92fd096d1ff0d4cccd8980c93c3bff4fa8?hp=b7b36f92fd096d1ff0d4cccd8980c93c3bff4fa8

mergetool: Remove spurious error message if merge.tool config option not set

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---