about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2017-08-31 13:45:12 -0400
committerJune McEnroe <june@causal.agency>2017-08-31 13:45:12 -0400
commit22198d6399a006f59d162b2e00a7b8205c8f6e9b (patch)
treec6242b4cb91c1a0315a2ba9dd15d1f75c22e47b4
parentAdd quick data file merge tool (diff)
downloadtorus-22198d6399a006f59d162b2e00a7b8205c8f6e9b.tar.gz
torus-22198d6399a006f59d162b2e00a7b8205c8f6e9b.zip
Choose B for tiles with equal modify times
This way newer access counts and times will be preserved.
-rw-r--r--merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge.c b/merge.c
index 04396d6..e5a5f64 100644
--- a/merge.c
+++ b/merge.c
@@ -90,7 +90,7 @@ int main(int argc, char *argv[]) {
         if (!lenA || !lenB) errx(EX_IOERR, "different size inputs");
 
         if (tileA.modify == tileB.modify) {
-            ssize_t lenC = writeAll(c, (char *)&tileA, sizeof(tileA));
+            ssize_t lenC = writeAll(c, (char *)&tileB, sizeof(tileB));
             if (lenC < 0) err(EX_IOERR, "%s", argv[3]);
             continue;
         }
pan>backwards compat with new optiondestruc7i0n 2020-04-29add the ability to handle webhook messagesdestruc7i0n 2020-04-19Fixed tellraw components not being encoded properlyBen Landin 2020-02-11Update README.mddestruc7i0n 2020-02-05Precedencedestruc7i0n 2020-02-05Allow specification of the channel name rather than iddestruc7i0n 2020-02-05Some more cleanupdestruc7i0n 2020-02-05More config handlingdestruc7i0n 2020-02-04Update typesdestruc7i0n 2020-02-04Docs updatesdestruc7i0n 2020-02-04Code cleanupdestruc7i0n 2020-02-04Refactor and rebuild to TypeScriptdestruc7i0n 2019-02-11Local file supportdestruc7i0n 2018-11-11Let's make this usable again!destruc7i0n 2018-02-23Allow configurable discord formatArcensoth 2018-02-23Revert example tellraw format to mimic the originalArcensoth 2018-02-23Update readme with new tellraw config optionArcensoth 2018-02-23Allow configurable tellraw formatArcensoth 2018-02-23Allow config file to be passed as a parameterArcensoth