Junio C Hamano 14b9d9aa0d 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

2018-01-23 13:16:37 -08:00

63 KiB

Raw Blame History

View Raw