diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-04-23 19:26:58 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-04-23 19:42:50 -0400 |
| commit | 26564d80aa7b340f07e9c5b96457928ebadcc606 (patch) | |
| tree | 33618de26edc2f543a8ac303d0603fa25bdb9fa2 /src/merge.c | |
| parent | 212b6205d70ff7c0f0f0b1eda6ac964c8d09d431 (diff) | |
| download | libgit2-26564d80aa7b340f07e9c5b96457928ebadcc606.tar.gz | |
merge: default checkout strategy for should be SAFE
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index 2e40b6db8..0b73d2b91 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2186,7 +2186,7 @@ static int merge_normalize_checkout_opts( const git_merge_head **their_heads) { int error = 0; - unsigned int default_checkout_strategy = GIT_CHECKOUT_SAFE_CREATE | + unsigned int default_checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_ALLOW_CONFLICTS; GIT_UNUSED(repo); |