Files
git-mirror/t/t3310-notes-merge-manual-resolve.sh
Jacob Keller 11dd2b2e9a notes: add tests for --commit/--abort/--strategy exclusivity
Add new tests to ensure that --commit, --abort, and --strategy are
mutually exclusive.

Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-08-17 15:38:37 -07:00

16 KiB
Executable File