diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-01-19 15:05:08 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-01-20 17:15:13 -0500 |
| commit | e651e8e2b5c5eb021448fb0f0a36cb3f10fa9326 (patch) | |
| tree | c987d53e643065e1983bfd75e1549deb2c3edbb3 /src/commit.c | |
| parent | 6b92c99bcbf32de131754a4f750278f84bf5b766 (diff) | |
| download | libgit2-e651e8e2b5c5eb021448fb0f0a36cb3f10fa9326.tar.gz | |
Introduce diff3 mode for checking out conflicts
Diffstat (limited to 'src/commit.c')
0 files changed, 0 insertions, 0 deletions