Changeset 33003 for branches/haf_add201112/ippTools/src/mergetool.h

Timestamp:

Dec 22, 2011, 2:21:40 PM (15 years ago)

Author:

heather

Message:

whoo hooo! mergetool changes, now to test on maui

File:

• branches/haf_add201112/ippTools/src/mergetool.h (modified) (2 diffs)

branches/haf_add201112/ippTools/src/mergetool.h

@@ -1 +1 @@
 /*
- * 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 +30 @@
   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;