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/merge_file.c | |
| parent | 3acf44d6cb5e56fea379504c07ae7ac8dd0e586d (diff) | |
| download | libgit2-629b661caab321a3aa5ffd7274ea4ed441d2805e.tar.gz | |
checkout (from index) can write conflicts
Diffstat (limited to 'src/merge_file.c')
| -rw-r--r-- | src/merge_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge_file.c b/src/merge_file.c index c3477ccb9..48fc46e57 100644 --- a/src/merge_file.c +++ b/src/merge_file.c @@ -47,7 +47,7 @@ GIT_INLINE(int) merge_file_best_mode( * assume executable. Otherwise, if any mode changed from the ancestor, * use that one. */ - if (GIT_MERGE_FILE_SIDE_EXISTS(ancestor)) { + if (!GIT_MERGE_FILE_SIDE_EXISTS(ancestor)) { if (ours->mode == GIT_FILEMODE_BLOB_EXECUTABLE || theirs->mode == GIT_FILEMODE_BLOB_EXECUTABLE) return GIT_FILEMODE_BLOB_EXECUTABLE; |