Johan Herland <johan@xxxxxxxxxxx> writes: > I can't find "git merge --abort" and "git notes merge" in this list. > Suggested paragraphs: > > * "git merge" learned "--abort" option, synonymous to > "git reset --merge" when a merge is in progress. > > * "git notes" learned the "merge" subcommand to merge notes refs. > In addition to the default manual conflict resolution, there are > also several notes merge strategies for automatically resolving > notes merge conflicts. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html