commit 43c93a89a7024d8b8556207cd1404c6b563249e8 from: Omar Polo date: Mon Jan 04 14:04:31 2021 UTC typo commit - 8ed796d4347e6530a37aee28080c8c4de842c01e commit + 43c93a89a7024d8b8556207cd1404c6b563249e8 blob - 43ee10e2ddad4a6c4ceb6a3f89b4452da0fbc91f blob + 3a035360e11b5efb8001874a0012799e0abf45b2 --- vc-got.el +++ vc-got.el @@ -634,7 +634,7 @@ Value is returned as floating point fractional number ;; for got it doesn't matter where we call "got status", it will ;; always report file paths from the root of the repo. (cl-loop with conflicts = nil - for (file . status) in (vc-got--parse-status-flag + for (file . status) in (vc-got--parse-status (vc-got--status ".")) do (when (and (eq status 'conflict) (file-in-directory-p file dir))