From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Feb 2018 23:18:12 +0000 (-0800)
Subject: Merge branch 'jc/merge-symlink-ours-theirs' into maint
X-Git-Tag: v2.16.2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff19620f8127798dcfc1dab7c633eb7505b7abd3;p=thirdparty%2Fgit.git

Merge branch 'jc/merge-symlink-ours-theirs' into maint

"git merge -Xours/-Xtheirs" learned to use our/their version when
resolving a conflicting updates to a symbolic link.

* jc/merge-symlink-ours-theirs:
  merge: teach -Xours/-Xtheirs to symbolic link merge
---

ff19620f8127798dcfc1dab7c633eb7505b7abd3