Merge pull request #1615 from arthurschreiber/patch-1

Fix two typos in the merge docs.
This commit is contained in:
Edward Thomson 2013-05-28 14:12:55 -07:00
commit 504a4fd140

View File

@ -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 */