merge-recursive: option to specify rename threshold

diff --git a/wt-status.h b/wt-status.h
index 4f190454e5b2ad46b33894fb55aa7dd8dd28d604..4cd74c4b32f51dbe575b0a04a894a520df79e9bf 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -13,7 +13,7 @@ enum color_wt_status {
        WT_STATUS_NOBRANCH,
        WT_STATUS_UNMERGED,
        WT_STATUS_LOCAL_BRANCH,
-       WT_STATUS_REMOTE_BRANCH,
+       WT_STATUS_REMOTE_BRANCH
 };
 
 enum untracked_status_type {