From 618110327a3f36dec3902457150bfcc0f37b0f68 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Sat, 26 Jul 2014 04:00:15 +0900
Subject: [PATCH] (refs #443)Fix merge guidance

---
 src/main/twirl/pulls/mergeguide.scala.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/twirl/pulls/mergeguide.scala.html b/src/main/twirl/pulls/mergeguide.scala.html
index b2b84c506..d8f28d1a8 100644
--- a/src/main/twirl/pulls/mergeguide.scala.html
+++ b/src/main/twirl/pulls/mergeguide.scala.html
@@ -42,7 +42,7 @@
     <p>
       <span class="strong">Step 1:</span> Check out a new branch to test the changes — run this from your project directory
     </p>
-    @defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.requestBranch}"){ command =>
+    @defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.branch}"){ command =>
       @helper.html.copy("merge-command-copy-1", command){
         <pre style="width: 500px; float: left;">@command</pre>
       }
@@ -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.branch}\ngit push origin ${pullreq.branch}"){ command =>
+    @defining(s"git checkout master\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>
       }