elpasync pushed a change to branch elpa/git-commit.
from 421105ef4f magit-section-goto-successor(hunk): Make fourth argument
optional
new efb09e8d57 magit-renamed-files: Minor tweaks
new ce45c43f9d magit-ediff-resolve: Move definition
new 1e2b473f20 magit-ediff-resolve: Rename to magit-ediff-resolve-rest
new e2e90f7b0c magit-ediff-buffers: Cosmetics and new comments
new db2e9546f8 magit-ediff-buffers: Change argument order
new d035386e96 magit-ediff-buffers: Support merge jobs
new 46685b1c76 magit-ediff-resolve-all: New command
new 6fc4bacdee magit-ediff-resolve-{all,rest}: Use file at point
new 5a7519fd3d magit-ediff-dwim-resolve-function: New option
Summary of changes:
docs/magit.org | 86 ++++++++-------
docs/magit.texi | 92 ++++++++--------
lisp/magit-base.el | 2 +
lisp/magit-ediff.el | 300 +++++++++++++++++++++++++++++++++++----------------
lisp/magit-extras.el | 3 +-
lisp/magit-git.el | 17 ++-
6 files changed, 322 insertions(+), 178 deletions(-)
