Searched refs:unmergedFiles (Results 1 – 3 of 3) sorted by relevance
180 QStringList unmergedFiles; in slotDiffSelected() local187 unmergedFiles.push_back(fileName); in slotDiffSelected()206 if (!unmergedFiles.empty()) in slotDiffSelected()207 GitClient::instance()->merge(m_workingDirectory, unmergedFiles); in slotDiffSelected()
122 func unmergedFiles(ctx context.Context, tmpBasePath string, unmerged chan *unmergedFile) { func
228 go unmergedFiles(ctx, tmpBasePath, unmerged)