diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-07-23 15:32:42 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2013-10-16 16:20:10 -0400 |
| commit | 96d799aa1830f5fcbacdfd87eca728727561d8e6 (patch) | |
| tree | 83d1c7e2a7951263b7bf7b34f45ab08629784999 /tests-clar/diff/blob.c | |
| parent | 4f7897ab19daf6593b35c7f5b4f35403d00530ef (diff) | |
| download | libgit2-96d799aa1830f5fcbacdfd87eca728727561d8e6.tar.gz | |
checkout rename conflicts
rename conflict tests for checkout conflicts, don't suffix filenames
when checking out with USE_OURS or USE_THEIRS
Diffstat (limited to 'tests-clar/diff/blob.c')
0 files changed, 0 insertions, 0 deletions