proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-06 00:30:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
a15c7802c8
libgit2/tests/resources/revert
History
Edward Thomson c1d648c5c6 merge_file should use more aggressive levels 
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.
2014-01-20 17:15:11 -05:00
..
.gitted merge_file should use more aggressive levels 2014-01-20 17:15:11 -05:00
file1.txt Introduce git_revert to revert a single commit 2013-12-02 16:57:41 -06:00
file2.txt Introduce git_revert to revert a single commit 2013-12-02 16:57:41 -06:00
file3.txt Introduce git_revert to revert a single commit 2013-12-02 16:57:41 -06:00
file6.txt Introduce git_revert to revert a single commit 2013-12-02 16:57:41 -06:00