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 | | 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 'Zero.' | | # Create a branch in which '0' is replaced by '1'. | git branch one | git checkout one | echo '1' > test.R | git add . | git commit -m 'One.' | | # Replace '0' with '2' in the mater branch. | git checkout master | echo '2' > test.R | git add . | git commit -m 'Two.' | | # Attempt a merge, creating a conflict. | git checkout one | git merge master | | 2) Try running mergetool with emacs as editor: | | git mergetool -t emerge | | EXPECTED RESULT: | | A three-way merge interface comes up with files open in ESS R mode. | | ACTUAL RESULT: | | Empty emacs buffer appears, with the following message in the minibuffer | (without the quotes): | "ess-mode: Customise alist is not specified, nor ess-local-customize-alist is | set." | | | | -- System Information: | Debian Release: buster/sid | APT prefers testing | APT policy: (990, 'testing'), (500, 'stable-updates'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable') | Architecture: amd64 (x86_64) | Foreign Architectures: i386 | | Kernel: Linux 4.16.0-1-amd64 (SMP w/8 CPU cores) | Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8), LANGUAGE=en_AU.UTF-8 (charmap=UTF-8) | Shell: /bin/sh linked to /bin/dash | Init: systemd (via /run/systemd/system) | LSM: AppArmor: enabled | | Versions of packages ess depends on: | ii dpkg 1.19.0.5+b1 | ii emacsen-common 2.0.8 | ii install-info 6.5.0.dfsg.1-3 | | Versions of packages ess recommends: | ii r-base-core 3.4.4-1+b2 | | Versions of packages ess suggests: | ii jags 4.3.0-1 | ii julia 0.4.7-7+b3 | pn pspp <none> | pn xlispstat <none> | | -- no debconf information -- http://dirk.eddelbuettel.com | @eddelbuettel | e...@debian.org
