diff --git a/etc/mergeHistory b/etc/mergeHistory
new file mode 100644
index 0000000000000000000000000000000000000000..b825a958efed3f9c593a10668ff3a52d04b0f777
--- /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