| commit | 11dd2b2e9a3303bd1e32fd2ee95ec5dff38d9d47 | |
| author | Jacob Keller <jacob.keller@gmail.com> | |
| Mon, 17 Aug 2015 21:33:32 +0000 (17 14:33 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Aug 2015 22:38:37 +0000 (17 15:38 -0700) | ||
| tree | f01f0b9deecdae73b6e986b4f737769098e7bb89 | treesnapshot (tar.gz zip) |
| parent | 93efcad31777142840eaefc19b71d1a4b6a2fe24 | commitdiff |
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>
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>
| t/t3310-notes-merge-manual-resolve.sh | diffblobblamehistory |