From: Jacob Keller <jacob.keller@gmail.com>
Date: Mon, 17 Aug 2015 21:33:33 +0000 (-0700)
Subject: notes: add notes.mergeStrategy option to select default strategy
X-Git-Tag: v2.6.0-rc0~19^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d2d68d9975da4a15dfca0e6e59001948e5bf57f9?hp=d2d68d9975da4a15dfca0e6e59001948e5bf57f9

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>
---