Merge branch 'da/difftool'

diff --git a/check-racy.c b/check-racy.c
index d6a08b4a55273af1a5f2933f3b5c6cb818ba74c6..24b6542352a60006ac23c09a7cc17fb3aef009fa 100644 (file)
--- a/check-racy.c
+++ b/check-racy.c
@@ -12,13 +12,13 @@ int main(int ac, char **av)
                struct stat st;
 
                if (lstat(ce->name, &st)) {
-                       error("lstat(%s): %s", ce->name, strerror(errno));
+                       error_errno("lstat(%s)", ce->name);
                        continue;
                }
 
                if (ce_match_stat(ce, &st, 0))
                        dirty++;
-               else if (ce_match_stat(ce, &st, 2))
+               else if (ce_match_stat(ce, &st, CE_MATCH_RACY_IS_DIRTY))
                        racy++;
                else
                        clean++;