advice: Introduce error_resolve_conflict
[gitweb.git] / po /
drwxr-xr-x   parent (dest: ; base: 38ef61cfde8aea0864e898d37ce3213a5771c59e)