Move Merge.h into folly/algorithm/

Summary: [Folly] Move `Merge.h` into `folly/algorithm/`. Reviewed By: Orvid Differential Revision: D5951346 fbshipit-source-id: 487203e55e2a44888e599ca22849798154e5b386

Move Merge.h into folly/algorithm/
Summary: [Folly] Move `Merge.h` into `folly/algorithm/`. Reviewed By: Orvid Differential Revision: D5951346 fbshipit-source-id: 487203e55e2a44888e599ca22849798154e5b386
1b0dfd66 · Yedidya Feldblum · Facebook Github Bot · bf4d5370 · 1b0dfd66 · 1b0dfd66
Commit 1b0dfd66 authored Oct 01, 2017 by Yedidya Feldblum Committed by Facebook Github Bot Oct 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

folly/algorithm/Merge.h folly/algorithm/Merge.h +0 -0

folly/algorithm/test/MergeTest.cpp folly/algorithm/test/MergeTest.cpp +1 -1

No files found.
--- a/folly/Merge.h
+++ b/folly/Merge.h
--- a/folly/test/MergeTest.cpp
+++ b/folly/test/MergeTest.cpp
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
-#include <folly/Merge.h>
+#include <folly/algorithm/Merge.h>
 #include <map>
 #include <vector>