log

age author description
Thu, 08 May 2014 16:55:56 -0700 Durham Goode rebase: specify custom conflict marker labels for rebase (BC)
Fri, 09 May 2014 18:15:02 -0700 Durham Goode graft: customize graft conflict markers (BC)
Thu, 08 May 2014 16:54:23 -0700 Durham Goode merge: add labels parameter from merge.update to filemerge
Tue, 22 Apr 2014 13:32:05 -0700 Gregory Szorc run-tests: move interactive test acceptance into TestResult
Tue, 22 Apr 2014 13:25:17 -0700 Gregory Szorc run-tests: raise WarnTest outside of Test.fail()
Tue, 22 Apr 2014 13:16:34 -0700 Gregory Szorc run-tests: move diff generation into TestResult
Tue, 22 Apr 2014 12:35:18 -0700 Gregory Szorc run-tests: remove global abort flag