Junio C Hamano 8775279891 Merge branch 'jn/mergetool-hideresolved-is-optional' ...

Disable the recent mergetool's hideresolved feature by default for
backward compatibility and safety.

* jn/mergetool-hideresolved-is-optional:
  doc: describe mergetool configuration in git-mergetool(1)
  mergetool: do not enable hideResolved by default

2021-03-14 16:01:41 -07:00

..

add.txt

…

advice.txt

…

alias.txt

…

am.txt

…

apply.txt

…

blame.txt

…

branch.txt

…

browser.txt

…

checkout.txt

…

clean.txt

…

clone.txt

…

color.txt

…

column.txt

…

commit.txt

…

commitgraph.txt

…

completion.txt

…

core.txt

…

credential.txt

…

diff.txt

…

difftool.txt

…

extensions.txt

…

fastimport.txt

…

feature.txt

…

fetch.txt

…

filter.txt

…

fmt-merge-msg.txt

…

format.txt

…

fsck.txt

…

gc.txt

…

gitcvs.txt

…

gitweb.txt

…

gpg.txt

…

grep.txt

…

gui.txt

…

guitool.txt

…

help.txt

…

http.txt

…

i18n.txt

…

imap.txt

…

index.txt

…

init.txt

…

instaweb.txt

…

interactive.txt

…

log.txt

…

lsrefs.txt

…

mailinfo.txt

…

mailmap.txt

…

maintenance.txt

…

man.txt

…

merge.txt

…

mergetool.txt

…

notes.txt

…

pack.txt

…

pager.txt

…

pretty.txt

…

protocol.txt

…

pull.txt

…

push.txt

…

rebase.txt

…

receive.txt

…

remote.txt

…

remotes.txt

…

repack.txt

…

rerere.txt

…

reset.txt

…

sendemail.txt

…

sequencer.txt

…

showbranch.txt

…

splitindex.txt

…

ssh.txt

…

stash.txt

…

status.txt

…

submodule.txt

…

tag.txt

…

tar.txt

…

trace2.txt

…

transfer.txt

…

uploadarchive.txt

…

uploadpack.txt

…

url.txt

…

user.txt

…

versionsort.txt

…

web.txt

…

worktree.txt

…