diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-01-31 09:28:43 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-31 09:28:43 -0800 |
| commit | 9d8510b3bec46a1de7f598a5ab8305be54800b04 (patch) | |
| tree | db7d3fe5afae75f9b4f59fe1550fc284c10a859e /include/git2/annotated_commit.h | |
| parent | cdab165df44baf3464ae1e5ddff6d04a65e02304 (diff) | |
| parent | db39807c8957d88593632f75f8e5e8661a646ee5 (diff) | |
| download | libgit2-9d8510b3bec46a1de7f598a5ab8305be54800b04.tar.gz | |
Merge pull request #4488 from libgit2/ethomson/conflict_marker_size
Use longer conflict markers in recursive merge base
Diffstat (limited to 'include/git2/annotated_commit.h')
0 files changed, 0 insertions, 0 deletions