about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorJune McEnroe <programble@gmail.com>2017-08-31 13:45:12 -0400
committerJune McEnroe <programble@gmail.com>2017-08-31 13:45:12 -0400
commitcf94e1b5a227b0a64eae2de78884c14b44dada6b (patch)
treef373e66bcdb39a79f2d484d7052d3cd37a74b001
parentAdd quick data file merge tool (diff)
downloadtorus-cf94e1b5a227b0a64eae2de78884c14b44dada6b.tar.gz
torus-cf94e1b5a227b0a64eae2de78884c14b44dada6b.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 e0ddea0..26e00dd 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;
         }
29 -0500'>2020-02-11Add -R restricted flagJune McEnroe 2020-02-11Add chroot targetJune McEnroe 2020-02-11Exit focus and paste modes on err exitJune McEnroe 2020-02-11Add startup GPLv3 note and URLJune McEnroe 2020-02-11Make sure -D_GNU_SOURCE ends up in CFLAGS on LinuxJune McEnroe 2020-02-11Add note about setting PKG_CONFIG_PATHJune McEnroe 2020-02-11Rename query ID on nick changeJune McEnroe 2020-02-11Call completeClear when closing a windowJune McEnroe 2020-02-11Don't insert color codes for non-mentionsJune McEnroe 2020-02-11Take first two words in colorMentionsJune McEnroe 2020-02-11Use time_t for save signatureJune McEnroe 2020-02-11Set self.nick to * initiallyJune McEnroe 2020-02-11Define ColorCap instead of hardcoding 100June McEnroe 2020-02-11Move hash to top of chat.hJune McEnroe 2020-02-11Move base64 out of chat.hJune McEnroe 2020-02-11Move XDG_SUBDIR out of chat.hJune McEnroe 2020-02-11Fix whois idle unit calculationJune McEnroe 2020-02-11Cast towupper to wchar_tJune McEnroe 2020-02-11Cast set but unused variables to voidJune McEnroe 2020-02-11Declare strlcatJune McEnroe 2020-02-11Check if VDSUSP existsJune McEnroe 2020-02-11Fix completeReplace iterationJune McEnroe 2020-02-11Use pkg(8) to configure on FreeBSDJune McEnroe 2020-02-11Remove legacy codeJune McEnroe 2020-02-11Add INSTALLING section to READMEJune McEnroe