summary refs log tree commit diff homepage
path: root/.gitignore
diff options
context:
space:
mode:
authorJune McEnroe <programble@gmail.com>2017-08-31 15:37:36 -0400
committerJune McEnroe <programble@gmail.com>2017-08-31 15:37:36 -0400
commitaa81ed84fc03060ea270766427d9e3232d130855 (patch)
tree2ef943fa1b8f662cb92c135562dd4d0ff75bee48 /.gitignore
parentChoose B for tiles with equal modify times (diff)
downloadtorus-aa81ed84fc03060ea270766427d9e3232d130855.tar.gz
torus-aa81ed84fc03060ea270766427d9e3232d130855.zip
Clean up merge tool
Choose the version with the most recent access if the modify times are
the same.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions