Fri, 06 Oct 2017 06:48:43 -0700 | Ryan McElroy | merge: allow user to halt merge on merge-tool failures | file | diff | annotate |
Fri, 06 Oct 2017 06:48:43 -0700 | Ryan McElroy | merge: add tests to show current behavior on failed filemerges | file | diff | annotate |