package server

import (
	"github.com/gin-gonic/gin"
	"gopkg.in/mgo.v2"
)

// RegisterRoutes registers all routes needed to serve the patient merging service.
func RegisterRoutes(router *gin.Engine, session *mgo.Session, dbname string, fhirHost string) {

	mc := NewMergeController(session, dbname, fhirHost)

	// Merging and confict resolution.
	router.POST("/merge", mc.Merge)
	router.POST("/merge/:merge_id/resolve/:conflict_id", mc.Resolve)

	// Abort or delete a merge. Abort is just an alias for delete.
	router.POST("/merge/:merge_id/abort", mc.DeleteMerge)
	router.DELETE("/merge/:merge_id", mc.DeleteMerge)

	// Convenience routes.
	router.GET("/merge", mc.AllMerges)
	router.GET("/merge/:merge_id", mc.GetMerge)
	router.GET("/merge/:merge_id/conflicts", mc.GetRemainingConflicts)
	router.GET("/merge/:merge_id/resolved", mc.GetResolvedConflicts)
	router.GET("/merge/:merge_id/target", mc.GetTarget)
}

package server

import (
	"github.com/gin-gonic/gin"
	"gopkg.in/mgo.v2"
)

// RegisterRoutes registers all routes needed to serve the patient merging service.
func RegisterRoutes(router *gin.Engine, session *mgo.Session, dbname string, fhirHost string) {

	mc := NewMergeController(session, dbname, fhirHost)

	// Merging and confict resolution
	router.POST("/merge", mc.Merge)
	router.POST("/merge/:merge_id/resolve/:conflict_id", mc.Resolve)
	router.POST("/merge/:merge_id/abort", mc.Abort)

	// Convenience routes
	router.GET("/merge", mc.AllMerges)
	router.GET("/merge/:merge_id", mc.GetMerge)
	router.GET("/merge/:merge_id/conflicts", mc.GetRemainingConflicts)
	router.GET("/merge/:merge_id/resolved", mc.GetResolvedConflicts)
	router.GET("/merge/:merge_id/target", mc.GetTarget)
}

--- 
+++ 
@@ -10,12 +10,15 @@
 
 	mc := NewMergeController(session, dbname, fhirHost)
 
-	// Merging and confict resolution
+	// Merging and confict resolution.
 	router.POST("/merge", mc.Merge)
 	router.POST("/merge/:merge_id/resolve/:conflict_id", mc.Resolve)
-	router.POST("/merge/:merge_id/abort", mc.Abort)
 
-	// Convenience routes
+	// Abort or delete a merge. Abort is just an alias for delete.
+	router.POST("/merge/:merge_id/abort", mc.DeleteMerge)
+	router.DELETE("/merge/:merge_id", mc.DeleteMerge)
+
+	// Convenience routes.
 	router.GET("/merge", mc.AllMerges)
 	router.GET("/merge/:merge_id", mc.GetMerge)
 	router.GET("/merge/:merge_id/conflicts", mc.GetRemainingConflicts)
Abort is now alias for DeleteMerge

Both the POST /merge/:merge_id/abort and DELETE /merge/:merge_id perform the same operation.
