diff options
| author | Sun He <sunheehnus@gmail.com> | 2014-03-06 11:16:36 +0800 |
|---|---|---|
| committer | Sun He <sunheehnus@gmail.com> | 2014-03-06 11:16:36 +0800 |
| commit | 6246de93b65fc74cba2e17ab031402adff84433f (patch) | |
| tree | 676fbb35641726736b0cc8053f73ec9f1ed03d0e /src/commit.c | |
| parent | 8384a50a2171f57cc1b8158777b124d2022db94e (diff) | |
| parent | a064dc2d0b6206116a35be4b62c58c3c1170d5de (diff) | |
| download | libgit2-6246de93b65fc74cba2e17ab031402adff84433f.tar.gz | |
Merge completed: resolve the conflict with the upstream
Diffstat (limited to 'src/commit.c')
0 files changed, 0 insertions, 0 deletions