summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2012-02-13 17:33:10 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-13 15:57:06 -0800
commit6463fd7ed189f4100e1102062f29b969384f1436 (patch)
tree30191df0aeae55632f7ee4a40b26d7d101207698 /git-mergetool--lib.sh
parentdiff-highlight: don't highlight whole lines (diff)
downloadtgif-6463fd7ed189f4100e1102062f29b969384f1436.tar.xz
diff-highlight: refactor to prepare for multi-line hunks
The current code structure assumes that we will only look at a pair of lines at any given time, and that the end result should always be to output that pair. However, we want to eventually handle multi-line hunks, which will involve collating pairs of removed/added lines. Let's refactor the code to return highlighted pairs instead of printing them. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions