log

age author description
Sun, 11 Oct 2015 18:37:54 -0700 Siddharth Agarwal merge.mergestate._resolve: also return completed status
Sun, 11 Oct 2015 18:29:50 -0700 Siddharth Agarwal merge.mergestate: add a wrapper around resolve
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
Sun, 11 Oct 2015 15:04:00 -0700 Siddharth Agarwal filemerge: clean up some dead code