Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-09 04:37:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #606 from bati11/fix-mergeguide-text

Browse Source 
Fix merge guide's text
This commit is contained in:
Naoki Takezoe
2015-01-21 01:39:37 +09:00
parent 135e1ef73d f1ac2b3507
commit 31b6adf0e5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/twirl/pulls/mergeguide.scala.html
View File

@@ -62,7 +62,7 @@
<p>
<span class="strong">Step 3:</span> Merge the changes and update the server
</p>
@defining(s"git checkout master\ngit merge ${pullreq.requestUserName}-${pullreq.requestBranch}\ngit push origin ${pullreq.branch}"){ command =>
@defining(s"git checkout ${pullreq.branch}\ngit merge ${pullreq.requestUserName}-${pullreq.requestBranch}\ngit push origin ${pullreq.branch}"){ command =>
@helper.html.copy("merge-command-copy-3", command){
<pre style="width: 500px; float: left;">@command</pre>
}