- 25 Nov, 2015 2 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
- 22 Oct, 2015 1 commit
-
-
Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which will stop on the first conflict and fail the merge operation with GIT_EMERGECONFLICT.
Edward Thomson committed
-
- 20 Mar, 2014 2 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
- 25 Jan, 2014 1 commit
-
-
This was not converted when we converted the rest, so do it now.
Carlos Martín Nieto committed
-
- 09 Dec, 2013 1 commit
-
-
Edward Thomson committed
-
- 03 Dec, 2013 1 commit
-
-
Edward Thomson committed
-