Thanks for catching that, Szeder. I tested this revised patch under
GETTEXT_POISON and it should be passing tests now.
Changes since V1:
* Only check MERGE_MSG for a scissors line instead of all prepended
files
* Make a variable static in merge where appropriate
* Add passthrough options in pull
* Add documentation for the new option
* Add tests to ensure desired behaviour
Changes since V2:
* Merge both patches into one patch
* Fix bug in help message printing logic
Changes since V3:
* Add patch to cleanup 'merge --squash c3 with c7' test in t7600
* Use test_i18ncmp instead of test_cmp to pass GETTEXT_POISON tests
Denton Liu (2):
t7600: clean up 'merge --squash c3 with c7' test
merge: add scissors line on merge conflict
Documentation/merge-options.txt | 6 ++++
builtin/commit.c | 20 +++++++++----
builtin/merge.c | 16 ++++++++++
builtin/pull.c | 6 ++++
t/t7600-merge.sh | 53 ++++++++++++++++++++++++++++++---
5 files changed, 92 insertions(+), 9 deletions(-)
--
2.19.1
