diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-12-25 10:00:28 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-12-30 12:54:13 +0100 |
| commit | aed53a70ee5fc1ea12c17cf74f21e481e83c9034 (patch) | |
| tree | 0e7177324c6ef085486724bc49127ca3ba1fa593 /src/plugins/git/commitdata.h | |
| parent | a570e7327f787adc219972bcbc8a3973819b708e (diff) | |
| download | qt-creator-aed53a70ee5fc1ea12c17cf74f21e481e83c9034.tar.gz | |
Git: Place conflicted files last in submit editor
Change-Id: Ie4c7423d85f3f568d04d6c86e8b8123c73dab5fb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/commitdata.h')
| -rw-r--r-- | src/plugins/git/commitdata.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/git/commitdata.h b/src/plugins/git/commitdata.h index 8be3ad3993..40fb452313 100644 --- a/src/plugins/git/commitdata.h +++ b/src/plugins/git/commitdata.h @@ -109,6 +109,8 @@ private: bool checkLine(const QString &stateInfo, const QString &file); }; +bool operator<(const CommitData::StateFilePair &a, const CommitData::StateFilePair &b); + } // namespace Internal } // namespace Git |