summaryrefslogtreecommitdiff
path: root/git2.nobj.lua
diff options
context:
space:
mode:
Diffstat (limited to 'git2.nobj.lua')
-rw-r--r--git2.nobj.lua1
1 files changed, 1 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",
},
}