From 18b037a5b61532cba7f19efdb2e75c258d87d3d7 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Thu, 5 Aug 2010 06:24:58 -0500 Subject: ll-merge: let caller decide whether to renormalize MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a “renormalize” bit to the ll-merge options word so callers can decide on a case-by-case basis whether the merge is likely to have overlapped with a change in smudge/clean rules. This reveals a few commands that have not been taking that situation into account, though it does not fix them. No functional change intended. Cc: Eyvind Bernhardsen Improved-by: Junio C Hamano Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- ll-merge.h | 1 + 1 file changed, 1 insertion(+) (limited to 'll-merge.h') diff --git a/ll-merge.h b/ll-merge.h index 5990271dce..ff7ca87bfa 100644 --- a/ll-merge.h +++ b/ll-merge.h @@ -8,6 +8,7 @@ #define LL_OPT_VIRTUAL_ANCESTOR (1 << 0) #define LL_OPT_FAVOR_MASK ((1 << 1) | (1 << 2)) #define LL_OPT_FAVOR_SHIFT 1 +#define LL_OPT_RENORMALIZE (1 << 3) static inline int ll_opt_favor(int flag) { -- cgit v1.2.1