projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] Use a temporary index file when we merge the common ancestors.
[git.git]
/
diff-helper.c
diff --git
a/diff-helper.c
b/diff-helper.c
index
3fa50ee
..
734956e
100644
(file)
--- a/
diff-helper.c
+++ b/
diff-helper.c
@@
-91,7
+91,7
@@
int main(int ac, const char **av) {
if (*cp++ != ' ')
break;
status = *cp++;
- if (!strchr("
MCRN
DU", status))
+ if (!strchr("
AMCR
DU", status))
break;
two_paths = score = 0;
if (status == DIFF_STATUS_RENAMED ||