git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e17cec2 fd48b46)
Merge branch 'jc/merge-symlink-ours-theirs' into maint
authorJunio C Hamano <redacted>
Thu, 15 Feb 2018 23:18:12 +0000 (15:18 -0800)
committerJunio C Hamano <redacted>
Thu, 15 Feb 2018 23:18:12 +0000 (15:18 -0800)
commitff19620f8127798dcfc1dab7c633eb7505b7abd3
tree951ce9d107d92af51782af584fbe812f1e00ed91tree | snapshot
parente17cec27d18c730dae738684d2f5df1dbd54a804commit | diff
parentfd48b464747c275b3d014b3f14d60d9ac19d184acommit | diff
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
merge-recursive.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT