- 10 Oct, 2014 1 commit
-
-
Some PRs have fallen out of sync with the changes in signatures, so we need to take a few extra parameters into account.
Carlos Martín Nieto committed
-
- 12 Sep, 2014 1 commit
-
-
Added test case to illustrate bogus conflicts detected if no files were merged, and untracked files exist in the workdir.
Jacques Germishuys committed
-
- 03 Aug, 2014 1 commit
-
-
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth committed
-
- 22 Jul, 2014 1 commit
-
-
Edward Thomson committed
-
- 14 Apr, 2014 1 commit
-
-
Jacques Germishuys committed
-