Home
last modified time | relevance | path

Searched refs:unmergedFiles (Results 1 – 3 of 3) sorted by relevance

/dports/devel/qtcreator/qt-creator-opensource-src-5.0.3/src/plugins/git/
H A Dgitsubmiteditor.cpp180 QStringList unmergedFiles; in slotDiffSelected() local
187 unmergedFiles.push_back(fileName); in slotDiffSelected()
206 if (!unmergedFiles.empty()) in slotDiffSelected()
207 GitClient::instance()->merge(m_workingDirectory, unmergedFiles); in slotDiffSelected()
/dports/www/gitea/gitea-1.16.5/services/pull/
H A Dpatch_unmerged.go122 func unmergedFiles(ctx context.Context, tmpBasePath string, unmerged chan *unmergedFile) { func
H A Dpatch.go228 go unmergedFiles(ctx, tmpBasePath, unmerged)