Commit 504a4fd140223e17871e219ae17568b303c7c9a1

Edward Thomson 2013-05-28T14:12:55

Merge pull request #1615 from arthurschreiber/patch-1 Fix two typos in the merge docs.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
diff --git a/include/git2/merge.h b/include/git2/merge.h
index af8f360..ce3ed8e 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 */