Junio C Hamano ff19620f81 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

2018-02-15 15:18:12 -08:00

63 KiB

Raw Blame History

View Raw