log tests/test-merge-halt.t @ 34765:f3e4a5ad0d90

age author description
Fri, 06 Oct 2017 06:48:43 -0700 Ryan McElroy merge: add tests to show current behavior on failed filemerges