comparison mainwindow.h @ 237:c9a7e4ec2f78

* Try to do the right thing when completely reverting a merge (forget that the merge took place)
 * When trying to clone from remote repo to existing local dir, offer to create a subdir instead
 * Tidy up clone-successful notification
 * Add a note to commit and revert confirmation dialogs to tell user if they are committing/reverting only a subset of available files

     bool complainAboutUnknownFolder(QString);
     bool complainAboutInitInRepo(QString);
     bool complainAboutInitFile(QString);
     bool complainAboutCloneToExisting(QString);
     bool complainAboutCloneToFile(QString);
-    bool complainAboutCloneToExistingFolder(QString); //!!! not sure about this one
+    QString complainAboutCloneToExistingFolder(QString local, QString remote); // returns new location, or empty string for cancel
 
     bool askToInitExisting(QString);
     bool askToInitNew(QString);
     bool askToOpenParentRepo(QString, QString);
     bool askToOpenInsteadOfInit(QString);