summaryrefslogtreecommitdiff
path: root/t/t4117-apply-reject.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-14 10:29:59 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-14 10:29:59 -0800
commita1d68bea891118bdaecb6dd77610e6daf2f7d53d (patch)
treec9fcf59d0b60c42afeafd0a68e13dc2f72521d0b /t/t4117-apply-reject.sh
parentMerge branch 'nd/status-show-in-progress' (diff)
parentcombine-diff.c: teach combined diffs about line prefix (diff)
downloadtgif-a1d68bea891118bdaecb6dd77610e6daf2f7d53d.tar.xz
Merge branch 'jk/diff-graph-cleanup'
Refactors a lot of repetitive code sequence from the graph drawing code and adds it to the combined diff output. * jk/diff-graph-cleanup: combine-diff.c: teach combined diffs about line prefix diff.c: use diff_line_prefix() where applicable diff: add diff_line_prefix function diff.c: make constant string arguments const diff: write prefix to the correct file graph: output padding for merge subsequent parents
Diffstat (limited to 't/t4117-apply-reject.sh')
0 files changed, 0 insertions, 0 deletions