diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-23 13:16:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-23 13:16:37 -0800 |
| commit | 14b9d9aa0d2fc6fd81d7a392fc1cc951a9d9d115 (patch) | |
| tree | 1ca0e09bdde1dc240bb9051cccf1ae45c3cd6570 /builtin/commit.c | |
| parent | Merge branch 'rs/lose-leak-pending' (diff) | |
| parent | merge: teach -Xours/-Xtheirs to symbolic link merge (diff) | |
| download | git-14b9d9aa0d2fc6fd81d7a392fc1cc951a9d9d115.tar.gz git-14b9d9aa0d2fc6fd81d7a392fc1cc951a9d9d115.zip | |
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
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions