git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 93efcad)
notes: add tests for --commit/--abort/--strategy exclusivity
authorJacob Keller <redacted>
Mon, 17 Aug 2015 21:33:32 +0000 (14:33 -0700)
committerJunio C Hamano <redacted>
Mon, 17 Aug 2015 22:38:37 +0000 (15:38 -0700)
commit11dd2b2e9a3303bd1e32fd2ee95ec5dff38d9d47
treef01f0b9deecdae73b6e986b4f737769098e7bb89tree | snapshot
parent93efcad31777142840eaefc19b71d1a4b6a2fe24commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t3310-notes-merge-manual-resolve.sh diff | blob | history
git clone https://git.99rst.org/PROJECT