diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-07-17 09:49:56 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2013-10-16 16:20:06 -0400 |
| commit | 629b661caab321a3aa5ffd7274ea4ed441d2805e (patch) | |
| tree | 52e5236b88ec970a513caf1a35844e230ccfa91e /src/diff.c | |
| parent | 3acf44d6cb5e56fea379504c07ae7ac8dd0e586d (diff) | |
| download | libgit2-629b661caab321a3aa5ffd7274ea4ed441d2805e.tar.gz | |
checkout (from index) can write conflicts
Diffstat (limited to 'src/diff.c')
0 files changed, 0 insertions, 0 deletions