From de6db604774b5d25405f9a8d358050f2da5b21a4 Mon Sep 17 00:00:00 2001
From: Douglas Huff <dhuff@jrbobdobbs.org>
Date: Sun, 7 Apr 2013 13:58:25 -0700
Subject: [PATCH] Fix overlapping test case names.

---
 spec/controllers/merge_requests_controller_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/controllers/merge_requests_controller_spec.rb b/spec/controllers/merge_requests_controller_spec.rb
index e8dd9bf995c..796de23bfe3 100644
--- a/spec/controllers/merge_requests_controller_spec.rb
+++ b/spec/controllers/merge_requests_controller_spec.rb
@@ -12,7 +12,7 @@ describe MergeRequestsController do
   end
 
   describe "#show" do
-    shared_examples "export as" do |format|
+    shared_examples "export merge as" do |format|
       it "should generally work" do
         get :show, project_id: project.code, id: merge_request.id, format: format
 
@@ -44,7 +44,7 @@ describe MergeRequestsController do
     end
 
     describe "as diff" do
-      include_examples "export as", :diff
+      include_examples "export merge as", :diff
       let(:format) { :diff }
 
       it "should really only be a git diff" do
@@ -55,7 +55,7 @@ describe MergeRequestsController do
     end
 
     describe "as patch" do
-      include_examples "export as", :patch
+      include_examples "export merge as", :patch
       let(:format) { :patch }
 
       it "should really be a git email patch with commit" do