log

age author description
Thu, 09 Oct 2014 16:57:45 -0700 Martin von Zweigbergk test-merge5: remove obsolete '-y' and its motivating comment
Fri, 17 Oct 2014 11:01:05 -0400 Augie Fackler test-resolve.t: use redirection to /dev/null instead of grep -q
Wed, 08 Oct 2014 22:30:04 -0700 Martin von Zweigbergk resolve: run happily after conflict-free merge