From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Jan 2018 21:16:37 +0000 (-0800)
Subject: Merge branch 'jc/merge-symlink-ours-theirs'
X-Git-Tag: v2.17.0-rc0~149
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14b9d9aa0d2fc6fd81d7a392fc1cc951a9d9d115;p=thirdparty%2Fgit.git

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

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

14b9d9aa0d2fc6fd81d7a392fc1cc951a9d9d115