Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
completion: put matching ctags symbol names directly into COMPREPLY
[gitweb.git]
/
builtin
/
difftool.c
diff --git
a/builtin/difftool.c
b/builtin/difftool.c
index 42ad9e804aa65ee6397a58ea853bb6510fd71918..b5e85ab0794fc08941cfdb87c4a8c2e62447e199 100644
(file)
--- a/
builtin/difftool.c
+++ b/
builtin/difftool.c
@@
-567,7
+567,7
@@
static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
warning(_("both files modified: '%s' and '%s'."),
wtdir.buf, rdir.buf);
warning(_("working tree file has been left."));
- warning("");
+ warning("
%s", "
");
err = 1;
} else if (unlink(wtdir.buf) ||
copy_file(wtdir.buf, rdir.buf, st.st_mode))