Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'tg/conflict-marker-size' into maint
author
Junio C Hamano
<gitster@pobox.com>
Wed, 21 Nov 2018 13:57:53 +0000
(22:57 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 21 Nov 2018 13:57:53 +0000
(22:57 +0900)
Developer aid.
* tg/conflict-marker-size:
.gitattributes: add conflict-marker-size for relevant files
raw
|
combined
(merge:
7532a18
b9b07ef
)
Trivial merge