summaryrefslogtreecommitdiff
path: root/t/t4211/expect.multiple
diff options
context:
space:
mode:
authorLibravatar Jacob Keller <jacob.keller@gmail.com>2015-08-17 14:33:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-17 15:38:54 -0700
commitd2d68d9975da4a15dfca0e6e59001948e5bf57f9 (patch)
treef72d519b0d953932d25a8095a504e814d2ffc871 /t/t4211/expect.multiple
parentnotes: add tests for --commit/--abort/--strategy exclusivity (diff)
downloadtgif-d2d68d9975da4a15dfca0e6e59001948e5bf57f9.tar.xz
notes: add notes.mergeStrategy option to select default strategy
Teach git-notes about "notes.mergeStrategy" to select a general strategy for all notes merges. This enables a user to always get expected merge strategy such as "cat_sort_uniq" without having to pass the "-s" option manually. Signed-off-by: Jacob Keller <jacob.keller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4211/expect.multiple')
0 files changed, 0 insertions, 0 deletions