From 1b0dfd663244c1d743052072a507f1b9e1f88d05 Mon Sep 17 00:00:00 2001
From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Sun, 1 Oct 2017 22:11:27 -0700
Subject: [PATCH] Move Merge.h into folly/algorithm/

Summary: [Folly] Move `Merge.h` into `folly/algorithm/`.

Reviewed By: Orvid

Differential Revision: D5951346

fbshipit-source-id: 487203e55e2a44888e599ca22849798154e5b386
---
 folly/{ => algorithm}/Merge.h            | 0
 folly/{ => algorithm}/test/MergeTest.cpp | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename folly/{ => algorithm}/Merge.h (100%)
 rename folly/{ => algorithm}/test/MergeTest.cpp (98%)

diff --git a/folly/Merge.h b/folly/algorithm/Merge.h
similarity index 100%
rename from folly/Merge.h
rename to folly/algorithm/Merge.h
diff --git a/folly/test/MergeTest.cpp b/folly/algorithm/test/MergeTest.cpp
similarity index 98%
rename from folly/test/MergeTest.cpp
rename to folly/algorithm/test/MergeTest.cpp
index bfd5c2a1..a9637680 100644
--- a/folly/test/MergeTest.cpp
+++ b/folly/algorithm/test/MergeTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/Merge.h>
+#include <folly/algorithm/Merge.h>
 
 #include <map>
 #include <vector>
-- 
2.34.1