Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git p4: use "git p4" directly in tests
[gitweb.git]
/
xdiff-interface.c
diff --git
a/xdiff-interface.c
b/xdiff-interface.c
index 164581f87f49935f0d1b1885420960a4d11dea56..0e2c169227ad29b5bf546c6c1b97e1a1d8ed7409 100644
(file)
--- 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 (!strc
asec
mp(var, "merge.conflictstyle")) {
+ if (!strcmp(var, "merge.conflictstyle")) {
if (!value)
die("'%s' is not a boolean", var);
if (!strcmp(value, "diff3"))