]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e17cec2 fd48b46)
Merge branch 'jc/merge-symlink-ours-theirs' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Feb 2018 23:18:12 +0000 (15:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Feb 2018 23:18:12 +0000 (15:18 -0800)
"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

1  2 
merge-recursive.c patch | diff1 | diff2 | blob | history

diff --cc merge-recursive.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.