diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-11-05 03:28:57 +0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2013-11-05 07:33:05 +0400 |
| commit | 1d3a8aeb4bd032d0bf34039fbcb308fba06b862a (patch) | |
| tree | 8e9165cfd8c4c3919abd2d4f301b1f45e281d5eb /src/merge.h | |
| parent | f966acd13366d21e0b9beeecf021c0114596c716 (diff) | |
move mode_t to filebuf_open instead of _commit
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/merge.h b/src/merge.h index ba6725de9..0ecad6e3e 100644 --- a/src/merge.h +++ b/src/merge.h @@ -16,6 +16,7 @@ #define GIT_MERGE_MSG_FILE "MERGE_MSG" #define GIT_MERGE_MODE_FILE "MERGE_MODE" +#define GIT_MERGE_FILE_MODE 0666 #define GIT_MERGE_TREE_RENAME_THRESHOLD 50 #define GIT_MERGE_TREE_TARGET_LIMIT 1000 |