0
@@ -75,7 +75,7 @@ class RemoteController < ApplicationController
0
   
0
   protected
0
     def setup_auto_merge(source, branch)
0
-      remote_branches = git.branch.list_names(:remote).with_this_at_front(/(\/|^)#{branch.name}$/)
0
+      remote_branches = git.branch.list_names(:remote, :remote_name => source ).with_this_at_front(/(\/|^)#{branch.name}$/)
0
       remote_branch_name = TextMate::UI.request_item(:title => "Branch to merge from?", :prompt => "Merge which branch to '#{branch.name}'?", :items => remote_branches, :force_pick => true)
0
       if remote_branch_name.nil? || remote_branch_name.empty?
0
         puts "Aborted"