• Junio C Hamano's avatar
    Merge branch 'jc/merge-symlink-ours-theirs' · 14b9d9aa
    Junio C Hamano authored
    "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
    14b9d9aa
merge-recursive.c 62.8 KB