[anjuta] Move around some things from the menu reorganization

[James Liggett <jrliggett src gnome org>]

commit 28a4f5e31aceb22c39bb88cf08e456b64b0feff7
Author: James Liggett <jrliggett cox net>
Date:   Sat Apr 18 01:23:46 2009 -0700

    Move around some things from the menu reorganization
    
    Keep the general idea of Johannes's earlier changes, just move some things around.
    I doubt we've heard the last of this. ;)
---
 plugins/git/anjuta-git.ui |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index ea45b59..7f3a067 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -6,20 +6,7 @@
 			<placeholder name="PlaceholderGitMenus">
 				<menuitem name="Commit..." action="ActionGitCommit" />
 				<menuitem name="Fetch" action="ActionGitFetch" />
-				<menuitem name="Pull..." action="ActionGitPull" />
-				<placeholder name="PlaceholderBranches">
-				<menu name="BranchesMenu" action="ActionMenuGitBranches">
-				  <menuitem name="Create branch..." action="ActionGitCreateBranch" />
-				  <menuitem name="Delete branch..." action="ActionGitDeleteBranch" />
-				  <menuitem name="Switch to another branch..." action="ActionGitSwitch" />
-				  <menuitem name="Merge..." action="ActionGitMerge" />
-				  <placeholder name="PlaceholderRemoteMenu">
-					  <menu name="Remote branches" action="ActionMenuGitRemoteBranches">
-						  <menuitem name="Add..." action="ActionGitRemoteAdd" />
-						  <menuitem name="Delete..." action="ActionGitRemoteDelete" />
-					  </menu>
-					</placeholder>
-					<placeholder name="PlaceholderRebaseMenu">
+				<placeholder name="PlaceholderRebaseMenu">
 					<menu name="Rebase" action="ActionMenuGitRebase">
 						<menuitem name="Start..." action="ActionGitRebaseStart" />
 						<separator name="rebase_separator1" />
@@ -28,21 +15,36 @@
 						<menuitem name="Abort" action="ActionGitRebaseAbort" />
 					</menu>
   				</placeholder>
-  		  </menu>
-  		  </placeholder>
 				<menuitem name="Create patch series..." action="ActionGitCreatePatchSeries" />
 				<menuitem name="Diff uncommitted changes" action="ActionGitDiffUncommitted" />
-  		  <separator />
+				<separator />
+				<placeholder name="PlaceholderBranches">
+					<menu name="BranchesMenu" action="ActionMenuGitBranches">
+				  		<menuitem name="Create branch..." action="ActionGitCreateBranch" />
+				  		<menuitem name="Delete branch..." action="ActionGitDeleteBranch" />
+				  		<menuitem name="Switch to another branch..." action="ActionGitSwitch" />
+				  		<menuitem name="Merge..." action="ActionGitMerge" />
+				  		<menuitem name="Pull..." action="ActionGitPull" />
+				  		<placeholder name="PlaceholderRemoteMenu">
+							<menu name="Remote branches" action="ActionMenuGitRemoteBranches">
+						  		<menuitem name="Add..." action="ActionGitRemoteAdd" />
+						  		<menuitem name="Delete..." action="ActionGitRemoteDelete" />
+					  		</menu>
+						</placeholder>
+  		  			</menu>
+				</placeholder>
+				<separator />
 				<menuitem name="Check out files..." action="ActionGitCheckoutFiles" />
-				<separator name="separator1" />
 				<menuitem name="Unstage files..." action="ActionGitUnstageFiles" />
+				<menuitem name="Resolve conflicts..." action="ActionGitResolve" />
+				<separator name="separator1" />
 				<menuitem name="Reset tree..." action="ActionGitReset" />
 				<menuitem name="Revert commit..." action="ActionGitRevert" />
-				<menuitem name="Resolve conflicts..." action="ActionGitResolve" />
 				<separator name="separator4" />
 				<menuitem name="Add..." action="ActionGitAdd" />
 				<menuitem name="Remove..." action="ActionGitRemove" />
 				<menuitem name="Ignore..." action="ActionGitIgnore" />
+				<separator />
 				<menuitem name="Create tag..." action="ActionGitCreateTag" />
 				<separator name="separator2" />
 				<placeholder name="PlaceholderBisectMenu">