aboutsummaryrefslogtreecommitdiffstats
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-27 14:37:55 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-27 14:37:56 -0700
commita0bf40ddc94d8ec57c2422b29ba82f3450211300 (patch)
tree830f20f92ef7463a1a0b539d36c9afb828237de4 /commit.h
parentMerge branch 'kb/ancestry-path-threedots' into maint (diff)
parentcombine-diff.c: Fix output when changes are exactly 3 lines apart (diff)
downloadgit-a0bf40ddc94d8ec57c2422b29ba82f3450211300.tar.gz
git-a0bf40ddc94d8ec57c2422b29ba82f3450211300.zip
Merge branch 'mk/combine-diff-context-horizon-fix' into maint
* mk/combine-diff-context-horizon-fix: combine-diff.c: Fix output when changes are exactly 3 lines apart
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions