diff options
author | Edward Thomson <ethomson@microsoft.com> | 2013-08-09 20:23:36 -0500 |
---|---|---|
committer | Edward Thomson <ethomson@microsoft.com> | 2013-10-16 16:20:18 -0400 |
commit | cfae7f85fbbc5b0e023e94f78486bf72cc1436f5 (patch) | |
tree | a49385f788684e72f48a27b7b3ab834ab7266865 /tests-clar/diff/blob.c | |
parent | 6f8cc7bb6a77e7b03751051be86a0c6b36bdd86f (diff) | |
download | libgit2-cfae7f85fbbc5b0e023e94f78486bf72cc1436f5.tar.gz |
Honor UPDATE_ONLY bit when checking out conflicts
Diffstat (limited to 'tests-clar/diff/blob.c')
0 files changed, 0 insertions, 0 deletions