0
@@ -146,7 +146,7 @@ class BranchController < ApplicationController
0
         TextMate::UI.alert(:warning, "Error - couldn't switch", "Git said:\n#{output}\nYou're probably in the middle of a conflicted merge, and need to commit", "OK")
0
         exit_discard
0
       when /fatal: Entry '(.+)' not uptodate\. Cannot merge\./
0
-        response = TextMate::UI.alert(:informational, "Conflict detected if you switch", "There are uncommitted changes that will cause conflicts by this switch (#{$1}).\nSwitch anyways?", "No", "Yes")
0
+        response = TextMate::UI.alert(:informational, "Conflicts may happen if you switch", "There are uncommitted changes that might cause conflicts by this switch (#{$1}).\nSwitch anyways?", "No", "Yes")
0
         if response=="Yes"
0
           output = git.command("checkout", "-m", target_branch)
0
           puts htmlize(output)

0
@@ -72,7 +72,7 @@ describe BranchController do
0
       it "should ask you if you'd like to force when uncommitted files exist" do
0
         @set_branch_to_choose.call("task")
0
         Git.command_response["checkout", "task"] = %{fatal: Entry 'branch_spec.rb' not uptodate. Cannot merge.\n}
0
-        TextMate::UI.should_receive(:alert).with(:informational, "Conflict detected if you switch", "There are uncommitted changes that will cause conflicts by this switch (branch_spec.rb).\nSwitch anyways?", "No", "Yes").and_return("Yes")
0
+        TextMate::UI.should_receive(:alert).with(:informational, "Conflicts may happen if you switch", "There are uncommitted changes that might cause conflicts by this switch (branch_spec.rb).\nSwitch anyways?", "No", "Yes").and_return("Yes")
0
         
0
         Git.command_response["checkout", "-m", "task"] = <<-EOF
0
 Auto-merged Support/spec/lib/commands/branch_spec.rb