Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
assign shortcut to "Edit Conflicted Files". arrange menu
  • Loading branch information
timcharper committed Jul 31, 2009
1 parent 6e7612a commit b7f6621
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions Commands/Edit Conflicted File.tmCommand
Expand Up @@ -11,6 +11,8 @@ require ENV['TM_BUNDLE_SUPPORT'] + '/environment.rb'
dispatch :controller =&gt; "status", :action =&gt; "edit_conflicted_file"</string>
<key>input</key>
<string>selection</string>
<key>keyEquivalent</key>
<string>^G</string>
<key>name</key>
<string>Edit Conflicted File…</string>
<key>output</key>
Expand Down
6 changes: 4 additions & 2 deletions info.plist
Expand Up @@ -22,6 +22,7 @@
<string>1D25F132-718E-4B97-95CC-724AAC35E46C</string>
<string>E56D4990-B615-4788-A46C-5D0CDE750D56</string>
<string>E9180CC9-BA7D-4271-A0A4-0263D8A71F46</string>
<string>B3577B4D-A3F1-4CB4-94B0-7A87CA658664</string>
<string>------------------------------------</string>
<string>83A04FEA-F4C4-47DF-B1A9-02549ACE7DEB</string>
<string>------------------------------------</string>
Expand All @@ -33,12 +34,13 @@
<string>------------------------------------</string>
<string>C6CD5A2A-E1DA-4D94-B561-331A2366AAC8</string>
<string>------------------------------------</string>
<string>0DBC221A-B726-4367-A5E1-04AB999F8CC2</string>
<string>7CE2C842-EBC4-443C-8DDB-3B16AC593D9A</string>
<string>------------------------------------</string>
<string>20F5C491-F71C-4963-9C61-DF7294976550</string>
<string>1FF5FF82-13A0-4C83-BAD6-D67AE8180FA9</string>
<string>1C12DE42-78A9-4DCA-BB55-2B8E6328C72D</string>
<string>D0DF4B19-F311-48CC-BF68-F8B33CD051D3</string>
<string>7CE2C842-EBC4-443C-8DDB-3B16AC593D9A</string>
<string>B3577B4D-A3F1-4CB4-94B0-7A87CA658664</string>
<string>------------------------------------</string>
<string>5A08145A-069F-4196-8F32-07C05EF4DCB6</string>
<string>------------------------------------</string>
Expand Down

0 comments on commit b7f6621

Please sign in to comment.