reword: mergebase

2 files changed, 28 insertions, 0 deletions

diff --git a/git2.nobj.lua b/git2.nobj.lua
index d937d5c..e698a2a 100644
--- a/git2.nobj.lua
+++ b/git2.nobj.lua
@@ -74,6 +74,7 @@ subfiles {
 "src/tag.nobj.lua",
 "src/revwalk.nobj.lua",
 "src/reference.nobj.lua",
+"src/merge.nobj.lua",
 },
 }
 
diff --git a/src/merge.nobj.lua b/src/merge.nobj.lua
new file mode 100644
index 0000000..32363e4
--- /dev/null
+++ b/src/merge.nobj.lua
@@ -0,0 +1,27 @@
+-- Copyright (c) 2010-2012 by Robert G. Jakabosky <bobby@sharedrealm.com>
+--
+-- Permission is hereby granted, free of charge, to any person obtaining a copy
+-- of this software and associated documentation files (the "Software"), to deal
+-- in the Software without restriction, including without limitation the rights
+-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-- copies of the Software, and to permit persons to whom the Software is
+-- furnished to do so, subject to the following conditions:
+--
+-- The above copyright notice and this permission notice shall be included in
+-- all copies or substantial portions of the Software.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+-- THE SOFTWARE.
+
+package "merge" {
+   c_function "base" {
+      c_call { "GitError", "int" } "git_merge_base" {
+	 "OID", "&base>1", "Repository *", "repo", "OID", "&one", "OID", "&two"
+      },
+   },
+}
\ No newline at end of file