[PATCH v2 0/4] merge: make merge state available to prepare-commit-msg hook

[Ryan Biesemeyer <ryan@yaauie.com>]

Ensure merge state is available to the prepare-commit-msg hook.

v2 patchset incorporates early feedback from the list

Matthieu Moy (1):
  t7505: add missing &&

Ryan Biesemeyer (3):
  t7505: ensure cleanup after hook blocks merge
  merge: make prepare_to_commit responsible for write_merge_state
  merge: drop unused arg from abort_commit method signature

 builtin/merge.c                    | 13 +++++++------
 t/t7505-prepare-commit-msg-hook.sh | 30 ++++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 10 deletions(-)

-- 
1.8.5