Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge tag 'l10n-2.20.0-rnd3' of https://github.com/git-l10n/git-po
[gitweb.git]
/
apply.c
diff --git
a/apply.c
b/apply.c
index 3746310cefae7ff8127cc033e0c11b3eb43eecd0..01793d612620246b14fa57f6ce3ed6c33df65d0f 100644
(file)
--- a/
apply.c
+++ b/
apply.c
@@
-1748,7
+1748,7
@@
static int parse_fragment(struct apply_state *state,
}
if (oldlines || newlines)
return -1;
- if (!deleted && !added)
+ if (!
patch->recount && !
deleted && !added)
return -1;
fragment->leading = leading;