[PATCH 0/2] set NO_TRIVIAL for custom merge strategies

As noticed at <http://bugs.debian.org/581691>, the example custom “theirs” strategy does not take effect for trivial merges. A user-defined “ours”-like strategy would also not be possible without this change.

Longer term, it would be nice to be able to override the NO_FAST_FORWARD and NO_TRIVIAL flags for custom strategies in ~/.gitconfig, but let’s wait until we need it.

Thoughts?

Jonathan Nieder (2):
  t7606 (merge-theirs): modernize style
  merge: let custom strategies intervene in trivial merges

 builtin/merge.c         |    1 +
 t/t7606-merge-custom.sh |   96 ++++++++++++++++++++++++++++++++++-------------
 2 files changed, 71 insertions(+), 26 deletions(-)