| commit | ff19620f8127798dcfc1dab7c633eb7505b7abd3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 15 Feb 2018 23:18:12 +0000 (15 15:18 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 15 Feb 2018 23:18:12 +0000 (15 15:18 -0800) | ||
| tree | 951ce9d107d92af51782af584fbe812f1e00ed91 | treesnapshot (tar.gz zip) |
| parent | e17cec27d18c730dae738684d2f5df1dbd54a804 | commitdiff |
| parent | fd48b464747c275b3d014b3f14d60d9ac19d184a | commitdiff |
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
"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 | blobhistory |