Commit 213dcf686f349d668f16d1ec7810045b4b8de191

Ran Benita 2012-06-29T17:31:10

Use enum for merge mode The merge mode shows up in a lot of functions, so it's useful to give it a distinct type. Signed-off-by: Ran Benita <ran234@gmail.com>