diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:37:55 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:37:56 -0700 |
commit | a0bf40ddc94d8ec57c2422b29ba82f3450211300 (patch) | |
tree | 830f20f92ef7463a1a0b539d36c9afb828237de4 /path.c | |
parent | Merge branch 'kb/ancestry-path-threedots' into maint (diff) | |
parent | combine-diff.c: Fix output when changes are exactly 3 lines apart (diff) | |
download | tgif-a0bf40ddc94d8ec57c2422b29ba82f3450211300.tar.xz |
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 'path.c')
0 files changed, 0 insertions, 0 deletions