For me I could reproduce like this: clone this repo: git://github.com/xing/amiando.git
git co -b magit-test v0.3.6 git cherry-pick e205ee0 This will give you a conflict, then on emacs on the conflicting file "lib/amiando.rb" hit "e" key. Hope this helps. Greetings and thanks On Jan 18, 5:31 pm, Yann Hodique <[email protected]> wrote: > On Wed, Jan 18, 2012 at 5:25 PM, theturingmachine > > <[email protected]> wrote: > > This is my emacs version: > > GNU Emacs 24.0.92.1 (i386-apple-darwin10.8.0, NS apple-appkit-1038.36) > > of 2012-01-16 on xxx > > > It was also happening before on 24.0.91 > > > I tried to get a backtrace but with toggle-debug-on-error it hangs... > > > Any clues, how can I provide you with more info? > > If you can provide the repository (or steps to build a repository that > behaves badly), and precise instructions on how to reproduce, we'll be > able to investigate. > > Yann.
