about summary refs log tree commit diff homepage
path: root/merge.c (follow)
Commit message (Expand)AuthorAge
* Support CP437 in mergeJune McEnroe2018-08-23
* Shrink the torus and rearrange struct TileJune McEnroe2018-08-21
* Fix color pairs once and for allJune McEnroe2018-08-05
* Tabify sourceJune McEnroe2018-07-17
* 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
imrc?id=fa48f5965c57272e616721d92475cd2f1e35f667&follow=1'>Disable powerline for nowJune McEnroe 2012-01-22Update some pluginsJune McEnroe 2012-01-22Add VCS repo directories to wildignoreJune McEnroe 2012-01-22Map ,e and ,b to CtrlP file and buffer respectivelyJune McEnroe 2012-01-22Add vim-spaceJune McEnroe 2012-01-22Add AutoCloseJune McEnroe 2012-01-22Add binding for GundoJune McEnroe 2012-01-22Add GundoJune McEnroe 2012-01-22Add Jellybeans colorschemeJune McEnroe 2012-01-22Add syntasticJune McEnroe 2012-01-21Add PowerlineJune McEnroe 2012-01-21Add quicktaskJune McEnroe 2012-01-15Moved comments out of mapsJune McEnroe 2012-01-14Disable scrollbarsJune McEnroe