Index: branches/haf_add201112/ippTools/src/mergetool.h
===================================================================
--- branches/haf_add201112/ippTools/src/mergetool.h	(revision 32980)
+++ branches/haf_add201112/ippTools/src/mergetool.h	(revision 33003)
@@ -1,6 +1,5 @@
 /*
- * addtool.h
+ * mergetool.h
  *
- * Copyright (C) 2006  Joshua Hoblitt, Christopher Waters
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -31,5 +30,9 @@
   MERGETOOL_MODE_LISTMERGED,
   MERGETOOL_MODE_REVERTMERGED,
-  MERGETOOL_MODE_UPDATEMERGED
+  MERGETOOL_MODE_UPDATEMERGED,
+  MERGETOOL_MODE_DEFINEBYQUERYMERGECOPY,
+  MERGETOOL_MODE_LISTMERGEDVODBCOPY,
+  MERGETOOL_MODE_REVERTMERGEDVODBCOPY,
+  MERGETOOL_MODE_UPDATEMERGEDVODBCOPY
 } mergetoolMode;