summaryrefslogtreecommitdiffstats
path: root/mergetools/tkdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-31 22:32:05 +0100
committerJunio C Hamano <gitster@pobox.com>2017-01-31 22:32:05 +0100
commit867ce0416c74ac5d403765ea94673ab8969b1a81 (patch)
treecffe3254caaf83564887228c2d0dfb622feb7513 /mergetools/tkdiff
parentMerge branch 'jc/compression-config' into maint (diff)
parentfast-import: properly fanout notes when tree is imported (diff)
downloadgit-867ce0416c74ac5d403765ea94673ab8969b1a81.tar.xz
git-867ce0416c74ac5d403765ea94673ab8969b1a81.zip
Merge branch 'mh/fast-import-notes-fix-new' into maint
"git fast-import" sometimes mishandled while rebalancing notes tree, which has been fixed. * mh/fast-import-notes-fix-new: fast-import: properly fanout notes when tree is imported
Diffstat (limited to 'mergetools/tkdiff')
0 files changed, 0 insertions, 0 deletions