Thread (2 messages) 2 messages, 2 authors, 2020-07-02

Re: [PATCH v5] Enable auto-merge for meld to follow the vim-diff beharior

From: Junio C Hamano <hidden>
Date: 2020-07-01 19:51:23

Đoàn Trần Công Danh  [off-list ref] writes:
quoted
+mergetool.meld.hasAutoMerge::
+	Older versions of `meld` do not support the `--auto-merge` option.
+	Setting `mergetool.meld.hasOutput` to `true` tells Git to
s/hasOutput/hasAutoMerge/

Bikeshed opinion: I don't know if hasAutoMerge is a good name :)
I do not think "has" is a good choice for this one, even though
hasOutput may very well be a good one for "output".  As the
paragraph describes (below), this lets the user "avoid" using
"--auto-merge", even if the version of "meld" the user has does have
the automerge capability.

So perhaps say "mergetool.meld.useAutoMerge"; that will let the users
express exactly their wish---don't use it (false), do forcibly try
to use it (true), or use it when able (auto).
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help