git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6709a11 b9b07ef)
Merge branch 'tg/conflict-marker-size'
authorJunio C Hamano <redacted>
Mon, 17 Sep 2018 20:53:49 +0000 (13:53 -0700)
committerJunio C Hamano <redacted>
Mon, 17 Sep 2018 20:53:49 +0000 (13:53 -0700)
Developer aid.

* tg/conflict-marker-size:
  .gitattributes: add conflict-marker-size for relevant files


Trivial merge
git clone https://git.99rst.org/PROJECT