about summary refs log tree commit diff homepage
path: root/merge.c (follow)
Commit message (Collapse)AuthorAge
* 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.
=c0c59d093fc5d1d0799c0830b470bfb72cf82062&follow=1'>Remove ROT13June McEnroe 2019-02-21Clean up man pageJune McEnroe 2019-01-26Draw UI before connectingJune McEnroe 2019-01-25Avoid unused variable warnings with getyxJune McEnroe 2019-01-25Add GNU/Linux build instructionsJune McEnroe