Add package sorting when sort-packages flag is enabled

ihor-sviziev · web-flow · commit 0327b7fb5f69 · 2018-12-20T14:17:34.000+02:00
Fix small typo
diff --git a/bin/composer-git-merge-driver b/bin/composer-git-merge-driver
@@ -202,7 +202,7 @@ if ($isLock) {
         }
     }
 
-    $merged = json_encode($result, JSON_ENCODE_OPTIONS);
+    $merged = json_encode($merged, JSON_ENCODE_OPTIONS);
 }
 
 // if we have conflicts, replace the conflict markers with the actual conflicting values

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ if ($isLock) {`
`202`	`202`	`}`
`203`	`203`	`}`
`204`	`204`
`205`		`- $merged = json_encode($result, JSON_ENCODE_OPTIONS);`
	`205`	`+ $merged = json_encode($merged, JSON_ENCODE_OPTIONS);`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`// if we have conflicts, replace the conflict markers with the actual conflicting values`