about summary refs log tree commit diff homepage
path: root/merge.c (follow)
Commit message (Expand)AuthorAge
* Use stdio in merge and metaJune McEnroe2018-03-05
* Rename Tile timestamps {create,modify,access}TimeJune McEnroe2018-03-05
* Undef COLOR_ constants in torus.hJune McEnroe2018-03-05
* Remove leading blank linesJune McEnroe2017-09-27
* Relicense AGPLJune McEnroe2017-09-03
* Clean up merge toolJune McEnroe2017-08-31
* Choose B for tiles with equal modify timesJune McEnroe2017-08-31
* Add quick data file merge toolJune McEnroe2017-08-31
~/.config which I keep in a different repo and I only want to use it for Vim so fuck you, Powerline. </rant> 2013-03-12Remove vim-powerlineJune McEnroe 2013-02-03Update base16 and refheapJune McEnroe 2013-02-03Ignore plugin/private.vimJune McEnroe 2012-09-29Disable GUI dialogsJune McEnroe