Skip to content

Commit

Permalink
Update README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
kinbei authored Nov 10, 2020
1 parent e9993c3 commit 43bd3ae
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ local config = {

(3) 第一次合并时, 必须指定 A 分支的版本号 ${REVISION} (将 A 分支 ${REVISION} 至 HEAD 合并至 B 分支)
```
lua -e"package.path = package.path .. \";svn-auto-merge/?.lua;xml2lua/?.lua\"" ./auto_merge.lua "auto_merge" config.lua ${REVISION}
lua -e"package.path = package.path .. \";xml2lua/?.lua\"" ./auto_merge.lua "auto_merge" config.lua ${REVISION}
```

0 comments on commit 43bd3ae

Please sign in to comment.