Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information