projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: daa81c4 0c3ef98)
Merge branch 'bg/apply-blank-trailing-context'
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:37:41 +0000 (22:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:37:41 +0000 (22:37 -0700)
* bg/apply-blank-trailing-context:
  apply: Allow blank *trailing* context lines to match beyond EOF

1  2 
builtin/apply.c patch | diff1 | diff2 | blob | history
t/t4124-apply-ws-rule.sh patch | diff1 | diff2 | blob | history

diff --cc builtin/apply.c
Simple merge
diff --cc t/t4124-apply-ws-rule.sh
Simple merge
Git—the stupid content tracker