[gitg] Fixed wrong order in merging two local branches

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 65ff0248474884c42aab130ad68f5982bd1e048e
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Sat Aug 29 12:08:28 2009 +0200

    Fixed wrong order in merging two local branches

 gitg/gitg-window.c |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/gitg/gitg-window.c b/gitg/gitg-window.c
index 3a0ad1e..6d196b2 100644
--- a/gitg/gitg-window.c
+++ b/gitg/gitg-window.c
@@ -2050,20 +2050,9 @@ on_rebase_branch_action_activate (GtkAction *action, GitgWindow *window)
 void
 on_merge_branch_action_activate (GtkAction *action, GitgWindow *window)
 {
-	gint source;
-	
-	if (gitg_ref_get_ref_type (window->priv->popup_refs[0]) == GITG_REF_TYPE_REMOTE)
-	{
-		source = 1;
-	}
-	else
-	{
-		source = 0;
-	}
-
 	add_branch_action (window, gitg_branch_actions_merge (window, 
-	                                                       window->priv->popup_refs[!source],
-	                                                       window->priv->popup_refs[source]));
+	                                                       window->priv->popup_refs[0],
+	                                                       window->priv->popup_refs[1]));
 }
 
 typedef struct