about summary refs log tree commit diff homepage
path: root/merge.c (follow)
Commit message (Collapse)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
| | | | | | | | | 8/16 color setup adapted from chat/ui.c. termcap patch hack no longer required. Black on black and bright black now work. Nothing will appear bold anymore on 256-color terminals. The keys for black have definitely always been in the help. You just didn't notice.
* Tabify sourceJune McEnroe2018-07-17
| | | | And other style changes.
* 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
| | | | | | | I know it's already published under a permissive license in what is probably its final form, but I want to license it AGPL anyway on principle following some conversations I had about open source, corporations and copyleft.
* Clean up merge toolJune McEnroe2017-08-31
| | | | | Choose the version with the most recent access if the modify times are the same.
* Choose B for tiles with equal modify timesJune McEnroe2017-08-31
| | | | This way newer access counts and times will be preserved.
* Add quick data file merge toolJune McEnroe2017-08-31
Hopefully I won't have to use it ever again.
o git-commentJune McEnroe 2021-09-08Add group threshold to git-commentJune McEnroe