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.
-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;
         }
3a31b21a9&follow=1'>Add box drawing glyphs to sans6x10June McEnroe 2018-09-29Tweak sans6x8 shading blocksJune McEnroe 2018-09-29Fill 7F through A5 of sans6x10June McEnroe 2018-09-29Add f and ' to psfedJune McEnroe 2018-09-28Add sans6x10 basic glyphsJune McEnroe 2018-09-28Make sans6x8 double quote narrowerJune McEnroe 2018-09-28Add greek glyphs to sans6x8June McEnroe 2018-09-28Add png target in etc/psfJune McEnroe 2018-09-28Disable visual bell in light terminal profileJune McEnroe 2018-09-28Add psf2pngJune McEnroe 2018-09-27Add HJKL for moving glyphs to psfedJune McEnroe 2018-09-27Move psfed paste to edit modeJune McEnroe 2018-09-27Export PWDJune McEnroe Without it, $(PWD) is unset in GNU make. 2018-09-27Add sans6x8 PSF2 fontJune McEnroe 2018-09-26Add copy paste to psfedJune McEnroe 2018-09-25Add r to psfed for invertJune McEnroe 2018-09-24Add psfed, a PSF2 font editorJune McEnroe 2018-09-21Add scheme -i to swap white and blackJune McEnroe 2018-09-21Map caps lock to escape on Linux consoleJune McEnroe 2018-09-19Fix README mandoc lintsJune McEnroe 2018-09-19Un-NOT trans.alpha values in pngoJune McEnroe 2018-09-18Refactor reads in pngo and clear palette between filesJune McEnroe 2018-09-17Add tRNS support to pngoJune McEnroe 2018-09-11Move gfx man pages to gfx/manJune McEnroe 2018-09-11Move bin man pages to bin/manJune McEnroe 2018-09-11Rewrite gfx.7 and render plaintext READMEJune McEnroe 2018-09-11Remove GAMES from BINSJune McEnroe 2018-09-11Rewrite bin.7 and render to plaintext READMEJune McEnroe 2018-09-11Add "blank" lines to man pagesJune McEnroe 2018-09-10Add mdoc syntax fileJune McEnroe 2018-09-08Fix Nm usage in multi-name man pagesJune McEnroe 2018-09-08Put real dates on man pagesJune McEnroe 2018-09-08Replace gfx README with REAMDE.7June McEnroe 2018-09-08Link gfx man pages in ~/.localJune McEnroe