summaryrefslogtreecommitdiff
path: root/notes-cache.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-02-17 17:21:41 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-02-17 17:21:41 -0800
commit78a26cb7204ddb96a5f75f09e41fbefd81c85f59 (patch)
tree712a759422ee38d5e4d4a49720a532f96833a3e3 /notes-cache.h
parentMerge branch 'jt/trace2-BUG' (diff)
parentmergetool: add per-tool support and overrides for the hideResolved flag (diff)
downloadtgif-78a26cb7204ddb96a5f75f09e41fbefd81c85f59.tar.xz
Merge branch 'sh/mergetool-hideresolved'
"git mergetool" feeds three versions (base, local and remote) of a conflicted path unmodified. The command learned to optionally prepare these files with unconflicted parts already resolved. * sh/mergetool-hideresolved: mergetool: add per-tool support and overrides for the hideResolved flag mergetool: break setup_tool out into separate initialization function mergetool: add hideResolved configuration
Diffstat (limited to 'notes-cache.h')
0 files changed, 0 insertions, 0 deletions