X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/a78d1c1f665179be91f5351d7921d05b2a58ca21..c59f93a3a869766b2a7c6b1ec34c7eb5526d7adb:/merges

diff --git a/merges b/merges
index adcbe7f..f593991 100644
--- a/merges
+++ b/merges
@@ -7,14 +7,10 @@
 #
 # (n is translated into a revision using git rev-list --reverse
 # --skip=<n> | head -n 1)
-invirt-console-host	invirt-console	2
-invirt-console-server	invirt-console	0
-invirt-remote-host	invirt-remote	0
-invirt-remote-server	invirt-remote	0
-sipb-xen-autoinstaller	invirt-autoinstaller	0
+
 sipb-xen-base	invirt-base	0
-sipb-xen-console-server	invirt-console-host	0
 sipb-xen-console	invirt-console-server	0
+sipb-xen-console-server	invirt-console-host	0
 sipb-xen-database	invirt-database	0
 sipb-xen-dev	invirt-dev	0
 sipb-xen-dhcp	invirt-dhcp	0
@@ -29,3 +25,8 @@ sipb-xen-remote-server	invirt-remote-server	0
 sipb-xen-vnc-client	invirt-vnc-client	0
 sipb-xen-vnc-server	invirt-vnc-server	0
 sipb-xen-www	invirt-web	0
+invirt-console-server	invirt-console	0
+invirt-console-host	invirt-console	2
+sipb-xen-autoinstaller	invirt-autoinstaller	0
+invirt-remote-host	invirt-remote	0
+invirt-remote-server	invirt-remote	0