diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-15 15:18:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 15:18:12 -0800 |
| commit | ff19620f8127798dcfc1dab7c633eb7505b7abd3 (patch) | |
| tree | 951ce9d107d92af51782af584fbe812f1e00ed91 /builtin/commit.c | |
| parent | Merge branch 'rs/lose-leak-pending' into maint (diff) | |
| parent | merge: teach -Xours/-Xtheirs to symbolic link merge (diff) | |
| download | git-ff19620f8127798dcfc1dab7c633eb7505b7abd3.tar.gz git-ff19620f8127798dcfc1dab7c633eb7505b7abd3.zip | |
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
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions