aboutsummaryrefslogtreecommitdiff
path: root/t/t4108-apply-threeway.sh
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2016-05-28 17:04:31 +0200
committerJunio C Hamano <gitster@pobox.com>2016-05-31 13:08:56 -0700
commite0876bca4de44638a1cb51b03bdf0a40df631a80 (patch)
treeeb3fd50f21adb94deee1823a68467b43cb002e3b /t/t4108-apply-threeway.sh
parent9e6a4cfc38aa81055d0b7d6fb94dc7b31809daa9 (diff)
downloadgit-e0876bca4de44638a1cb51b03bdf0a40df631a80.tar.gz
git-e0876bca4de44638a1cb51b03bdf0a40df631a80.tar.xz
xdiff: don't trim common tail with -W
The function trim_common_tail() exits early if context lines are requested. If -U0 and -W are specified together then it can still trim context lines that might belong to a changed function. As a result that function is shown incompletely. Fix that by calling trim_common_tail() only if no function context or fixed context is requested. The parameter ctx is no longer needed now; remove it. While at it fix an outdated comment as well. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4108-apply-threeway.sh')
0 files changed, 0 insertions, 0 deletions