diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-08-08 16:46:49 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2013-10-16 16:20:14 -0400 |
| commit | e47f859db9a52f38d9ca94d725a178ac4ba93836 (patch) | |
| tree | 3f9657dfa1fbc9f6d2dfa0512f061450604cc56d /tests-clar/diff/blob.c | |
| parent | fc36800ecd8f8903f4cf7e40a54966855fdd4b76 (diff) | |
| download | libgit2-e47f859db9a52f38d9ca94d725a178ac4ba93836.tar.gz | |
Don't overwrite ~ files checking out conflicts
If a D/F conflict or rename 2->1 conflict occurs,
we write the file sides as filename~branchname. If
a file with that name already exists in the working
directory, write as filename~branchname_0 instead.
(Incrementing 0 until a unique filename is found.)
Diffstat (limited to 'tests-clar/diff/blob.c')
0 files changed, 0 insertions, 0 deletions