Sun, 15 Oct 2017 20:36:29 -0700 Phil Cohen context: add workingfilectx.markcopied
Sun, 15 Oct 2017 20:36:29 -0700 Phil Cohen merge: don't use workers in in-memory mode
Sun, 15 Oct 2017 20:36:29 -0700 Phil Cohen filemerge: add a missing flushall()
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 tip