From 0192c281f001283633684eb34219a75324d61936 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Tue, 22 Dec 2015 16:53:39 +0000
Subject: [PATCH] ENH: Added mergeHistory doc showing merges from Foundation
 line

---
 etc/mergeHistory | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 etc/mergeHistory

diff --git a/etc/mergeHistory b/etc/mergeHistory
new file mode 100644
index 00000000000..b825a958efe
--- /dev/null
+++ b/etc/mergeHistory
@@ -0,0 +1,2 @@
+Date        SHA1     Commit message
+2015-12-02  9a536b0  fvOptions: Reorganized and updated to simplify use in sub-models and maintenance
-- 
GitLab