@markwoodhall ah, that sucks! i didn’t get too far, if that is any consolation 😛

This is more general than vim-fireplace specific but do any of you guys use splice? https://github.com/sjl/splice.vim

nice, normally I uses meld

@markwoodhall looks a bit unmaintained, based on the number of unresolved issues

Yeah, that is the main reason I was interested in what other people are using. I’ve been using it for a few years without any particular issues.

nice to know, that you uses it 🙂

I use fugitive.

:GDiff does a three way merge automatically

i also use fugitive

there is a good vimcast episode on resolving merge conflicts with fugitive

http://vimcasts.org/episodes/fugitive-vim-resolving-merge-conflicts-with-vimdiff/

Cool! I didn’t realise that. I’m mostly doing git stuff outside of vim.

@dominicm Was asyncwatchable branch supposed to use nrepl client fork?

Or is that separate change?

@juhoteperi I haven't pushed any submodule change yet. It's high on my to-do list

Okay