diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-09-23 09:47:47 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2013-10-16 16:20:19 -0400 |
| commit | 216f97e4f68c99c21d57a9196702df1f8f4366d4 (patch) | |
| tree | d0bbcdc72f8ae85b79e8bfb43d1893184aaaabda /tests-clar/diff/blob.c | |
| parent | cfae7f85fbbc5b0e023e94f78486bf72cc1436f5 (diff) | |
| download | libgit2-216f97e4f68c99c21d57a9196702df1f8f4366d4.tar.gz | |
Two-step conflict checkout (load / perform)
Move conflict handling into two steps: load the conflicts and
then apply the conflicts. This is more compatible with the
existing checkout implementation and makes progress reporting
more sane.
Diffstat (limited to 'tests-clar/diff/blob.c')
0 files changed, 0 insertions, 0 deletions