projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-merge-cache -o does all the automerges in a single shot
[git.git]
/
diff.c
diff --git
a/diff.c
b/diff.c
index
748ab4a
..
3230997
100644
(file)
--- a/
diff.c
+++ b/
diff.c
@@
-8,11
+8,11
@@
#include "cache.h"
#include "diff.h"
#include "cache.h"
#include "diff.h"
-static char *diff_opts = "-pu";
+static c
onst c
har *diff_opts = "-pu";
static const char *external_diff(void)
{
static const char *external_diff(void)
{
- static char *external_diff_cmd = NULL;
+ static c
onst c
har *external_diff_cmd = NULL;
static int done_preparing = 0;
if (done_preparing)
static int done_preparing = 0;
if (done_preparing)
@@
-26,11
+26,11
@@
static const char *external_diff(void)
*
* GIT_DIFF_OPTS="-c";
*/
*
* GIT_DIFF_OPTS="-c";
*/
- if (g
e
tenv("GIT_EXTERNAL_DIFF"))
- external_diff_cmd = g
e
tenv("GIT_EXTERNAL_DIFF");
+ if (g
i
tenv("GIT_EXTERNAL_DIFF"))
+ external_diff_cmd = g
i
tenv("GIT_EXTERNAL_DIFF");
/* In case external diff fails... */
/* In case external diff fails... */
- diff_opts = g
e
tenv("GIT_DIFF_OPTS") ? : diff_opts;
+ diff_opts = g
i
tenv("GIT_DIFF_OPTS") ? : diff_opts;
done_preparing = 1;
return external_diff_cmd;
done_preparing = 1;
return external_diff_cmd;