about summary refs log tree commit diff homepage
path: root/merge.c
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2017-09-01 00:08:07 -0400
committerJune McEnroe <june@causal.agency>2017-09-01 00:08:07 -0400
commit9a6c9c91c8092603b914cc0b3085d059e162ca29 (patch)
tree6cf07a47b23dd20f7c98fdcb729c1ce82969c86b /merge.c
parentClean up merge tool (diff)
downloadtorus-9a6c9c91c8092603b914cc0b3085d059e162ca29.tar.gz
torus-9a6c9c91c8092603b914cc0b3085d059e162ca29.zip
Add client readOnly mode
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions
ct'>Add port to april ssh configJune McEnroe 2016-05-28Add april to SSHJune McEnroe 2016-05-16Set background in nvim from iTerm profileJune McEnroe Is this overkill? 2016-05-15Add light iTerm profileJune McEnroe 2016-05-15Set gruvbox vert split relative to backgroundJune McEnroe 2016-05-15Cache GPG key for half an hourJune McEnroe 2016-04-29Test for linux insteadJune McEnroe 2016-04-29Remove explicit syntax/filetype onJune McEnroe neovim 0.1.4 actually doesn't need them! 2016-04-12Remove gvim=mvim aliasJune McEnroe 2016-04-12Detect Darwin or *BSD for aliasesJune McEnroe 2016-04-07Use default pinentry and set GPG_TTYJune McEnroe 2016-04-07Add git config override includeJune McEnroe 2016-04-06Simplify install scriptJune McEnroe 2016-04-06Add gpg-agent to READMEJune McEnroe 2016-04-06Always sign git commitsJune McEnroe 2016-04-06Use standard socket for gpg-agentJune McEnroe 2016-04-06Set iTerm font to PointfreeJune McEnroe