From b7f66210fdf5a4d8833a240bea24892578133caa Mon Sep 17 00:00:00 2001 From: Tim Harper Date: Fri, 31 Jul 2009 16:35:22 -0600 Subject: [PATCH] assign shortcut to "Edit Conflicted Files". arrange menu --- Commands/Edit Conflicted File.tmCommand | 2 ++ info.plist | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Commands/Edit Conflicted File.tmCommand b/Commands/Edit Conflicted File.tmCommand index 89ce723..e564c56 100644 --- a/Commands/Edit Conflicted File.tmCommand +++ b/Commands/Edit Conflicted File.tmCommand @@ -11,6 +11,8 @@ require ENV['TM_BUNDLE_SUPPORT'] + '/environment.rb' dispatch :controller => "status", :action => "edit_conflicted_file" input selection + keyEquivalent + ^G name Edit Conflicted File… output diff --git a/info.plist b/info.plist index 20000d8..016d63c 100644 --- a/info.plist +++ b/info.plist @@ -22,6 +22,7 @@ 1D25F132-718E-4B97-95CC-724AAC35E46C E56D4990-B615-4788-A46C-5D0CDE750D56 E9180CC9-BA7D-4271-A0A4-0263D8A71F46 + B3577B4D-A3F1-4CB4-94B0-7A87CA658664 ------------------------------------ 83A04FEA-F4C4-47DF-B1A9-02549ACE7DEB ------------------------------------ @@ -33,12 +34,13 @@ ------------------------------------ C6CD5A2A-E1DA-4D94-B561-331A2366AAC8 ------------------------------------ + 0DBC221A-B726-4367-A5E1-04AB999F8CC2 + 7CE2C842-EBC4-443C-8DDB-3B16AC593D9A + ------------------------------------ 20F5C491-F71C-4963-9C61-DF7294976550 1FF5FF82-13A0-4C83-BAD6-D67AE8180FA9 1C12DE42-78A9-4DCA-BB55-2B8E6328C72D D0DF4B19-F311-48CC-BF68-F8B33CD051D3 - 7CE2C842-EBC4-443C-8DDB-3B16AC593D9A - B3577B4D-A3F1-4CB4-94B0-7A87CA658664 ------------------------------------ 5A08145A-069F-4196-8F32-07C05EF4DCB6 ------------------------------------