sjl/splice.vim

Stars
240
Rank 168,229 (Top 4 %)
Language
Python
License
MIT License
Created over 12 years ago
Updated over 2 years ago

sjl/splice.vim

sjl

There are no reviews yet. Be the first to send feedback to the community and the maintainers!

A Vim plugin for managing three-way merges.

Splice

Splice is a Vim plugin for resolving conflicts during three-way merges.

Visit the site for more information.

Troubleshooting

Splice and Fugitive do not play well together. If you try to use Splice as a git mergetool while you have Fugitive installed it may segfault Vim, even if you're not using any Fugitive features.

Fugitive must be doing something behind the scenes even when you don't run any of its commands, but unfortunately the segfault doesn't give me a useful trace so I can find the issue. If you have any ideas on what might be happening please let me know -- I'd love to fix this.

gundo.vim

A git mirror of gundo.vim

learnvimscriptthehardway

badwolf

A Vim color scheme.

t

A command-line todo list manager for people that want to finish tasks, not organize them. (git mirror)

vitality.vim

Make Vim play nicely with iTerm 2 and tmux.

dotfiles

A git mirror of my dotfiles (.vimrc, .zshrc, .hgrc, etc). Note: this won't work on its own because the real repo uses Mercurial's subrepos. Look at .hgsub and .hgsubstate for what you'll need to get.

friendly-find

A friendlier find(1).

caves

The code for my Caves of Clojure series of blog posts.

clam.vim

A lightweight Vim plugin for working with shell commands.

d

Markdown files to documentation. Nothing else.

z-fish

A fork of http://github.com/rupa/z to port it to the Fish shell.

peat

Repeat commands!

stevelosh

A git mirror of my personal site.

cl-chip8

chip-8 emulator in common lisp

threesome.vim

A git mirror of threesome.vim.

temperance

A logic programming library for Common Lisp.

tslime2.vim

Send text from Vim to a tmux pane.

clojurecraft

A framework for writing Minecraft bots in Clojure. STILL ALPHA!

stoat

A sleek, lightweight, pluggable CMS app for Django.

cl-losh

red-tape

A Clojure library for working with forms.

bookmarkdown

flask-lesscss

A git mirror of flask-lesscss.

adopt

A Damn OPTion parsing library.

strftimedammit.vim

A single Vim documentation file that lists strftime-like formatting characters for a variety of languages.

flask-csrf

A git mirror of flask-csrf.

beast

Basic Entity/Aspect/System Toolkit

cl-digraph

A simple directed graph implementation for Common Lisp.

cl-nrepl

NREPL server for Common Lisp

flax

Weaving art from seeds.

dram

Clojure templating that won't make you drink.

cl-blt

Common Lisp bindings for bearlibterminal, with a Lispy interface on top.

tis100.vim

Git mirror of tis100.vim

rldt

roul

A tiny Clojure library for working with random numbers.

newseasons

A simple Clojure webapp for notifying users when new seasons of their favorite TV shows hit iTunes.

coding-math

pgworld

Procedural world generation in Unity (for GEDE at Reykjavík University 2016)

bobbin

Bobbin wraps strings.

typkov

django-hoptoad

I don't have time to work on django-hoptoad much any more, but there's a more active fork:

keymando-vim

A Keymando plugin to add a Vim-like editing mode everywhere.

euler

sand

advent

Git mirror of https://bitbucket.org/sjl/advent

scully

A General Game Player for imperfect-information games.

chancery

A text and data generation library for Common Lisp, inspired by Tracery.

zen

A throwaway roguelike non-game in Clojure.

alienscript

Look at the wiki.

mazes

introduction-to-mathematical-thinking

My notes/work for the Coursera Intro to Mathematical Thinking course.

silt2

Lisp Game Jam August 2016

silt

cl-netpbm

Common Lisp support for reading/writing PPM, PGM, and PBM files.

st

Mirror of st with my config and patches applied

flask-urls

A git mirror of flask-urls.

cl-ggp

Git mirror of https://bitbucket.org/sjl/cl-ggp/

brows

urlview in common lisp

antipodes

https://itch.io/jam/igi-1

dtach

A tiny program that emulates the detach feature of screen

boots

A simple text UI framework, inspired by _why's Shoes.

magitek

Whimsical robots infused with just a hint of magic.

cl-pcg

Permuted congruential generators in Common Lisp

eve

My talk at BACON 2012.

bones

Git mirror of https://bitbucket.org/sjl/bones/

gdl.vim

Git mirror of https://bitbucket.org/sjl/gdl.vim

merge-conflict-test

A simple repo that provides two branches with a merge conflict.

vex

Yet another vector math library for Common Lisp.

.plan

Git mirror of https://hg.stevelosh.com/.plan/

ruin

els

The Exciting Lisp Solver!

beef

shavin beefalos in common lisp

slock

fork of https://tools.suckless.org/slock/ with my patches

batty

A 2D Batformer for the October 2017 Lisp Game Jam.

sm-slurm-example

Demo of snakemake/slurm problem

cacl

hype

rosalind

Rosalind problems.

fern

conserve

Yet Another CSV Library for Common Lisp.

cl-gameboy

dbvolve

Database evolutions for Common Lisp.

constrained-game