git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 520cd9c de3d8bb)
Merge branch 'fc/rerere-conflict-style'
authorJunio C Hamano <redacted>
Tue, 3 Jun 2014 19:06:45 +0000 (12:06 -0700)
committerJunio C Hamano <redacted>
Tue, 3 Jun 2014 19:06:45 +0000 (12:06 -0700)
* fc/rerere-conflict-style:
  rerere: fix for merge.conflictstyle


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