Sun, 11 Oct 2015 20:04:40 -0700 Siddharth Agarwal filemerge: only copy to backup during premerge step
Sun, 11 Oct 2015 20:02:53 -0700 Siddharth Agarwal filemerge: only print out "merging f" output at premerge step
Thu, 08 Oct 2015 00:19:20 -0700 Siddharth Agarwal filemerge: deindent the parts of filemerge outside the try block
Sun, 11 Oct 2015 20:47:04 -0700 Siddharth Agarwal filemerge: introduce a premerge flag and function
Sun, 11 Oct 2015 12:56:21 -0700 Siddharth Agarwal filemerge: also return whether the merge is complete
Sun, 11 Oct 2015 12:31:08 -0700 Siddharth Agarwal filemerge: add a wrapper around the filemerge function
(0) -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 tip