diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-06-18 23:59:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-18 23:59:41 -0700 |
| commit | c86fbe5332abe6b951731940b9a8676ea90a434c (patch) | |
| tree | 6b646608bd2dcabcb410a6b64e647de5c57f5562 /git-merge-one-file.sh | |
| parent | diff.c: fix emit_line() again not to add extra line (diff) | |
| download | tgif-c86fbe5332abe6b951731940b9a8676ea90a434c.tar.xz | |
diff -c/--cc: do not include uninteresting deletion before leading context
When we include a few uninteresting lines before the interesting ones as
context, we are only interested in seeing the surviving lines themselves
and not the deleted lines that are before them. Mark the added leading
context lines in give_context() and not show deleted lines form them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions