The magit-imerge from magit

Magit-imerge is a Magit interface to git-imerge, a Git extension for performing incremental merges. See git-imerge's homepage for more information about git-imerge. The commentary in magit-imerge.el provides an overview of Magit-imerge commands.

magit-imerge's People

Contributors

Stargazers

Watchers

magit-imerge's Issues

Please create a tag

Binding conflicts with new magit-merge-into

By default i is now bound to magit-merge-into in the merge popup. How about binding I to magit-imerge-popup?

(void-function magit--checkout)

(1) what behavior you expected

aborting an imerge works

(2) what behavior you observed

See title

(3) and how we can reproduce the issue.

With magit checked out at f55be50f, abort a magit-imerge

Debugger entered--Lisp error: (void-function magit--checkout)
  magit--checkout("stdlib-serialization")
  #<subr magit-imerge-abort>()
  apply(#<subr magit-imerge-abort> nil)
  #f(compiled-function (fn &rest args) #<bytecode 0x3006706562954d7>)(#<subr magit-imerge-abort>)
  apply(#f(compiled-function (fn &rest args) #<bytecode 0x3006706562954d7>) #<subr magit-imerge-abort> nil)
  (lambda (fn &rest args) (interactive #f(compiled-function (spec) #<bytecode -0x9e249f3b72d570d>)) (apply '#f(compiled-function (fn &rest args) #<bytecode 0x3006706562954d7>) fn args))(#<subr magit-imerge-abort>)
  apply((lambda (fn &rest args) (interactive #f(compiled-function (spec) #<bytecode -0x9e249f3b72d570d>)) (apply '#f(compiled-function (fn &rest args) #<bytecode 0x3006706562954d7>) fn args)) #<subr magit-imerge-abort> nil)
  magit-imerge-abort()
  funcall-interactively(magit-imerge-abort)
  command-execute(magit-imerge-abort)

Also post the output of: