projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0bbab7d fd48b46)
Merge branch 'jc/merge-symlink-ours-theirs'
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Jan 2018 21:16:37 +0000 (13:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Jan 2018 21:16:37 +0000 (13:16 -0800)
commit14b9d9aa0d2fc6fd81d7a392fc1cc951a9d9d115
tree1ca0e09bdde1dc240bb9051cccf1ae45c3cd6570tree | snapshot
parent0bbab7d2ab61b6aad217706e0879db561e1bdfaecommit | diff
parentfd48b464747c275b3d014b3f14d60d9ac19d184acommit | diff
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
merge-recursive.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.