diff options
Diffstat (limited to 'builtin/merge-ours.c')
| -rw-r--r-- | builtin/merge-ours.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index 1fcf53f005..3ecd9172f1 100644 --- a/builtin/merge-ours.c +++ b/builtin/merge-ours.c @@ -7,7 +7,9 @@ * * Pretend we resolved the heads, but declare our tree trumps everybody else. */ + #define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "builtin.h" #include "diff.h" |