Merge branch 'jc/merge-symlink-ours-theirs' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Feb 2018 23:18:12 +0000 (15:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Feb 2018 23:18:12 +0000 (15:18 -0800)
"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

1  2 
merge-recursive.c

Simple merge