log

age author description
Tue, 22 Aug 2017 23:27:55 -0700 Martin von Zweigbergk context: always pass a matcher into _matchstatus() (API)
Wed, 23 Aug 2017 11:30:25 -0700 Jun Wu test-casecollision-merge: fix the test
Sun, 20 Aug 2017 09:46:27 -0700 Jun Wu run-tests: make per-line condition support testcase names
Fri, 25 Aug 2017 13:49:17 -0700 Phil Cohen simplemerge: refactor _picklabels to be more compact