From: John Keeping <john@keeping.me.uk>
Date: Thu, 22 May 2014 13:58:37 +0000 (+0100)
Subject: completion: add a note that merge options are shared
X-Git-Tag: v2.0.1~22^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6d2b06f02b9c69351a55a2cad0cfab33ecb6ee6f?hp=6d2b06f02b9c69351a55a2cad0cfab33ecb6ee6f

completion: add a note that merge options are shared

This should avoid future confusion after a subsequent patch has added
some options to __git_merge_options and some directly in _git_merge().

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---