X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=xdiff-interface.c;h=0e2c169227ad29b5bf546c6c1b97e1a1d8ed7409;hb=2f0b5fa4591faa293f06f5a1e58e22f713973861;hp=164581f87f49935f0d1b1885420960a4d11dea56;hpb=da656f17d37fe96454645c08f21a24134f5aa900;p=git.git

diff --git a/xdiff-interface.c b/xdiff-interface.c
index 164581f87..0e2c16922 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -347,7 +347,7 @@ int git_xmerge_style = -1;
 
 int git_xmerge_config(const char *var, const char *value, void *cb)
 {
-	if (!strcasecmp(var, "merge.conflictstyle")) {
+	if (!strcmp(var, "merge.conflictstyle")) {
 		if (!value)
 			die("'%s' is not a boolean", var);
 		if (!strcmp(value, "diff3"))