diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-10-27 18:00:30 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-11-25 15:37:51 -0500 |
| commit | b1eef912cffb9e3ce9792b6aee816c1a45c85fb0 (patch) | |
| tree | b6226cd31171a626f45ca5a290bd34ab92871605 /src/annotated_commit.c | |
| parent | 1b82f7b6a218080df8ff292ab12de744226a9979 (diff) | |
| download | libgit2-b1eef912cffb9e3ce9792b6aee816c1a45c85fb0.tar.gz | |
merge: add recursive test with conflicting contents
Diffstat (limited to 'src/annotated_commit.c')
0 files changed, 0 insertions, 0 deletions