Use libgit2 for checking for conflicts
commitd08fed25d88372d03927a7959c9fba6ce565bae0
authorSven Strickroth <email@cs-ware.de>
Fri, 6 Mar 2015 15:14:21 +0000 (6 16:14 +0100)
committerSven Strickroth <email@cs-ware.de>
Fri, 6 Mar 2015 15:15:10 +0000 (6 16:15 +0100)
tree9572ed2c9f24ccd6685edc9614f373cc55dd044f
parent29d5fbb34c1d37b6aa3eff1c2080c782e6164231
Use libgit2 for checking for conflicts

No need to parse the whole conflicts list if we just want to know if there are any.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Git/Git.cpp
src/Git/Git.h
src/TortoiseProc/AppUtils.cpp
src/TortoiseProc/RebaseDlg.cpp
src/TortoiseProc/SyncDlg.cpp
test/UnitTests/GitTest.cpp