From aed53a70ee5fc1ea12c17cf74f21e481e83c9034 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 25 Dec 2012 10:00:28 +0200
Subject: Git: Place conflicted files last in submit editor

Change-Id: Ie4c7423d85f3f568d04d6c86e8b8123c73dab5fb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/git/commitdata.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/plugins/git/commitdata.h')

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
 
-- 
cgit v1.2.1