Re: [PATCH 2/3] merge: Advise user to use "git merge --abort" to abort merges

Andrew Wong writes: > Print message during "git merge" and "git status". > > Add a new "mergeHints" advice to silence these messages. This sounds sensible. Don't we want to have this one take effect on the places where advice.resolveConflict is used in git-pull? I.e. something like: do

[PATCH 2/3] merge: Advise user to use "git merge --abort" to abort merges

Print message during "git merge" and "git status". Add a new "mergeHints" advice to silence these messages. Signed-off-by: Andrew Wong --- Documentation/config.txt | 3 +++ advice.c | 2 ++ advice.h | 1 + builtin/merge.c | 6 ++ wt-status.c