Re: [PATCH v4 2/4] notes: add tests for --commit/--abort/--strategy exclusivity

2015-08-11 Thread Johan Herland
On Tue, Aug 11, 2015 at 10:57 PM, Jacob Keller wrote: > From: Jacob Keller > > Add new tests to ensure that --commit, --abort, and --strategy are > mutually exclusive. > > Signed-off-by: Jacob Keller Reviewed-by: Johan Herland -- Johan Herland, www.herland.net -- To unsubscribe from this li

[PATCH v4 2/4] notes: add tests for --commit/--abort/--strategy exclusivity

2015-08-11 Thread Jacob Keller
From: Jacob Keller Add new tests to ensure that --commit, --abort, and --strategy are mutually exclusive. Signed-off-by: Jacob Keller --- t/t3310-notes-merge-manual-resolve.sh | 12 1 file changed, 12 insertions(+) diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-not