- 29 Dec, 2016 1 commit
-
-
Error messages should be sentence fragments, and therefore: 1. Should not begin with a capital letter, 2. Should not conclude with punctuation, and 3. Should not end a sentence and begin a new one
Edward Thomson committed
-
- 02 May, 2016 1 commit
-
-
The `merge_file__xdiff` function checks if either `ours` or `theirs` is `NULL`. The function is to be called with existing files, though, and in fact already unconditionally dereferences both pointers. Remove the unnecessary check to silence warnings.
Patrick Steinhardt committed
-
- 17 Mar, 2016 1 commit
-
-
Consumers can now register custom merged drivers with `git_merge_driver_register`. This allows consumers to support the merge drivers, as configured in `.gitattributes`. Consumers will be asked to perform the file-level merge when a custom driver is configured.
Edward Thomson committed
-
- 05 Oct, 2015 2 commits
-
-
Edward Thomson committed
-
xdiff craps the bed on large files. Treat very large files as binary, so that it doesn't even have to try. Refactor our merge binary handling to better match git.git, which looks for a NUL in the first 8000 bytes.
Edward Thomson committed
-
- 16 Mar, 2015 3 commits
-
-
Jacques Germishuys committed
-
Jacques Germishuys committed
-
Jacques Germishuys committed
-
- 31 Mar, 2014 2 commits
-
-
Russell Belfer committed
-
Edward Thomson committed
-
- 20 Mar, 2014 1 commit
-
-
Edward Thomson committed
-
- 25 Jan, 2014 2 commits
-
-
In the same vein as the previous commits in this series.
Carlos Martín Nieto committed -
This was not converted when we converted the rest, so do it now.
Carlos Martín Nieto committed
-
- 20 Jan, 2014 3 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
The default merge_file level was XDL_MERGE_MINIMAL, which will produce conflicts where there should not be in the case where both sides were changed identically. Change the defaults to be more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively compress non-conflicts. This matches git.git's defaults. Increase testing around reverting a previously reverted commit to illustrate this problem.
Edward Thomson committed
-
- 16 Oct, 2013 1 commit
-
-
Edward Thomson committed
-
- 15 May, 2013 1 commit
-
-
nulltoken committed
-
- 30 Apr, 2013 1 commit
-
-
Edward Thomson committed
-