default Edit Conflicted File to show as tooltip (in case it FAILS SO …

…HARD)
timcharper · Jul 31, 2009 · 2fbef1e · 2fbef1e
1 parent e6cabef
commit 2fbef1e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Commands/Edit Conflicted File.tmCommand b/Commands/Edit Conflicted File.tmCommand
@@ -16,7 +16,7 @@ dispatch :controller =&gt; "status", :action =&gt; "edit_conflicted_file"</strin
 	<key>name</key>
 	<string>Edit Conflicted File…</string>
 	<key>output</key>
-	<string>replaceSelectedText</string>
+	<string>showAsTooltip</string>
 	<key>uuid</key>
 	<string>0DBC221A-B726-4367-A5E1-04AB999F8CC2</string>
 </dict>