diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-05-28 14:12:55 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2013-05-28 14:12:55 -0700 |
| commit | 504a4fd140223e17871e219ae17568b303c7c9a1 (patch) | |
| tree | 0c69445a49254ebf3a1c020ccc5547289528b855 | |
| parent | 9007c53faecf51be7f166172682008d16f7d617a (diff) | |
| parent | 31a6118175a2a458f88211999952770949e3924c (diff) | |
| download | libgit2-504a4fd140223e17871e219ae17568b303c7c9a1.tar.gz | |
Merge pull request #1615 from arthurschreiber/patch-1
Fix two typos in the merge docs.
| -rw-r--r-- | include/git2/merge.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index af8f36063..ce3ed8ed2 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -23,8 +23,8 @@ GIT_BEGIN_DECL /** - * Flags for `git_mrege_tree` options. A combination of these flags can be - * passed in via the `flags` vlaue in the `git_merge_tree_opts`. + * Flags for `git_merge_tree` options. A combination of these flags can be + * passed in via the `flags` value in the `git_merge_tree_opts`. */ typedef enum { /** Detect renames */ |