about summary refs log tree commit diff homepage
path: root/merge.c
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 /merge.c
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.
Diffstat (limited to '')
-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;
         }
mit/bin/shotty.c?id=12f0a2b1c3a0817656ac8d7fd80335e260e90a4e&follow=1'>Use inline style rather than <b>, <i>, <u>June McEnroe 2019-07-11Factor out clearJune McEnroe 2019-07-11Add bright option to shottyJune McEnroe 2019-07-11Output <b>, <i>, <u> in shottyJune McEnroe 2019-07-10Ignore SM and RMJune McEnroe 2019-07-09Add shotty man page and build itJune McEnroe 2019-07-09Add up -cJune McEnroe 2019-07-09Add options for default colors to shottyJune McEnroe 2019-07-08Use char literals consistentlyJune McEnroe