Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

git-rfc3161
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

92cdfd21

Commit 92cdfd21 authored 9 years ago by Junio C Hamano

Downloads
- Plain Diff

Merge branch 'jk/xdiff-memory-limits' into maint-2.3

parents f2df3104 83c4d380

No related branches found

No related tags found

No related merge requests found

Changes 11

Show whitespace changes

Inline Side-by-side

Showing

builtin/blame.c 7 additions, 2 deletions

builtin/blame.c
builtin/merge-file.c 2 additions, 1 deletion

builtin/merge-file.c
builtin/merge-tree.c 2 additions, 1 deletion

builtin/merge-tree.c
builtin/rerere.c 6 additions, 4 deletions

builtin/rerere.c
combine-diff.c 4 additions, 2 deletions

combine-diff.c
diff.c 16 additions, 10 deletions

diff.c
diffcore-pickaxe.c 2 additions, 2 deletions

diffcore-pickaxe.c
line-log.c 4 additions, 3 deletions

line-log.c
ll-merge.c 4 additions, 1 deletion

ll-merge.c
xdiff-interface.c 3 additions, 0 deletions

xdiff-interface.c
xdiff-interface.h 7 additions, 0 deletions

xdiff-interface.h

with 57 additions and 26 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment