Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
31a61181
Commit
31a61181
authored
May 29, 2013
by
Arthur Schreiber
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix two typos in the merge docs.
parent
9007c53f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
include/git2/merge.h
+2
-2
No files found.
include/git2/merge.h
View file @
31a61181
...
...
@@ -23,8 +23,8 @@
GIT_BEGIN_DECL
/**
* Flags for `git_m
re
ge_tree` options. A combination of these flags can be
* passed in via the `flags` v
la
ue in the `git_merge_tree_opts`.
* Flags for `git_m
er
ge_tree` options. A combination of these flags can be
* passed in via the `flags` v
al
ue in the `git_merge_tree_opts`.
*/
typedef
enum
{
/** Detect renames */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment