Searched refs:conflicted_files (Results 1 – 2 of 2) sorted by relevance
175 conflicts = self._scm.conflicted_files()
265 def conflicted_files(self): member in SCM468 def conflicted_files(self): member in SVN741 def conflicted_files(self): member in Git