1 file changed
+1
-1
lines changed- src/blame.c+1-1
- src/blame_git.c+27-7
- src/blame_git.h+1-1
- src/checkout.c+2-1
- src/common.h+9
- src/diff_patch.c+4
- src/diff_xdiff.c+7
- src/diff_xdiff.h+5
- src/merge.c-56
- src/merge_file.c+76-22
- src/merge_file.h-14
- src/xdiff/xdiff.h+5-3
- src/xdiff/xdiffi.c+8-4
- src/xdiff/xhistogram.c+4-2
- src/xdiff/xmerge.c+98-44
- tests/merge/files.c+88
0 commit comments