summaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2008-07-04 19:10:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-05 07:37:44 (GMT)
commit6cf91492d9cd985e1fa65181d99d6d578d4439dc (patch)
tree167f08ae051d73ec55e1add3b85efa6fd370fe60 /git-merge-stupid.sh
parent7dde4bb3674da53dd9e33c741bea3fe680690a0d (diff)
downloadgit-6cf91492d9cd985e1fa65181d99d6d578d4439dc.zip
git-6cf91492d9cd985e1fa65181d99d6d578d4439dc.tar.gz
git-6cf91492d9cd985e1fa65181d99d6d578d4439dc.tar.bz2
Fix apply --recount handling of no-EOL line
If a patch modifies the last line of a file that previously had no terminating '\n', it looks like -old text \ No newline at end of file +new text Hence, a '\' line does not signal the end of the hunk. This modifies 'git apply --recount' to take this into account. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-stupid.sh')
0 files changed, 0 insertions, 0 deletions