OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
237e6db
a298604
)
Merge branch 'da/mergetool-delete-delete-conflict' into maint
author
Junio C Hamano
<gitster@pobox.com>
Fri, 15 Apr 2016 01:57:47 +0000
(18:57 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 15 Apr 2016 01:57:47 +0000
(18:57 -0700)
"git mergetool" did not work well with conflicts that both sides
deleted.
* da/mergetool-delete-delete-conflict:
mergetool: honor tempfile configuration when resolving delete conflicts
mergetool: support delete/delete conflicts
Trivial merge
OSDN Git Service
