diff options
| author | Ben Straub <bs@github.com> | 2014-02-05 13:35:26 -0800 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2014-02-05 13:35:26 -0800 |
| commit | a2ce19ca68e060838ec08d7f3e0c35160a2b6697 (patch) | |
| tree | e9afa1c78efcea75f04d4d195d8875520b1b6bd2 /src/commit.c | |
| parent | 5c8be3255905f77d60a239381d9ce39a6934a038 (diff) | |
| download | libgit2-a2ce19ca68e060838ec08d7f3e0c35160a2b6697.tar.gz | |
Prevent user's merge.conflictstyle from breaking tests
Diffstat (limited to 'src/commit.c')
0 files changed, 0 insertions, 0 deletions