Bug#901122: ess fails to start when emacs instance started with git mergetool

2018-06-09 Thread Pavel N. Krivitsky
Dirk, > How about we close this here and you reopen over here: > https://github.com/emacs-ess/ESS/issues > > There is not a long I can do for you here... Will do. I had filed it against Debian first, on the off chance that it was specific to where Debian put files or similar.

Bug#901122: ess fails to start when emacs instance started with git mergetool

2018-06-08 Thread Dirk Eddelbuettel
On 9 June 2018 at 12:28, Pavel N. Krivitsky wrote: | Package: ess | Version: 17.11-2 | Severity: normal | Tags: patch | | Dear Maintainer, How about we close this here and you reopen over here: https://github.com/emacs-ess/ESS/issues There is not a long I can do for you here... Dirk | |

Bug#901122: ess fails to start when emacs instance started with git mergetool

2018-06-08 Thread Pavel N. Krivitsky
Package: ess Version: 17.11-2 Severity: normal Tags: patch Dear Maintainer, STEPS TO REPRODUCE: 1) Set up a git merge conflict: # Create the repository. git init test cd test # Create and commit a file containing '0' (a syntactically correct R file). echo '0' > test.R git add . git commit -m