Merge branch 'rr/format-patch-count-without-merges'

diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 05bfa41f102801a5182e7fc642976f91e9ba7db6..c4bedf0d1ce1252563d7f36da7d846f5943343b0 100644 (file)
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -132,7 +132,7 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
        if (xecfg->flags & XDL_EMIT_COMMON)
                return xdl_emit_common(xe, xscr, ecb, xecfg);
 
-       for (xch = xche = xscr; xch; xch = xche->next) {
+       for (xch = xscr; xch; xch = xche->next) {
                xche = xdl_get_hunk(xch, xecfg);
 
                s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0);