Support for fixing conflicts outside Git repositories

[sersorrel]

I use yadm to manage my dotfiles, and occasionally get merge conflicts, which are moderately annoying to clean up. Is there any chance that fac could be made to support fixing conflicts in any given file, not just those in a Git repository?

[mkchoi212]

For now, fac detects where the conflict markers are by parsing the output of git diff --check. But we could definitely look into parsing the markers without depending on Git!

[toukoaozaki]

I would love this, as I'm using mercurial.

[mkchoi212]

Will gladly accept pull requests :D