Re: [PATCH 3/5] pull: handle conflicting rebase/merge options via last option wins

The --rebase[=...] flags and the various ff flags are incompatible,
except that --no-rebase (or --rebase=false) work with any of the ff
flags, and --ff works with any of the rebase flags.
[...]
Signed-off-by: Elijah Newren <redacted>
---

diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
+test_expect_success 'report conflicting configuration' '
+       git reset --hard c2 &&
+       test_must_fail git -c pull.ff=false -c pull.rebase=true pull . c1 2>err &&
+       test_i18ngrep "pull.rebase and pull.ff are incompatible; please unset one" err
+
+'