aboutsummaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-15 18:59:48 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-15 18:59:48 -0700
commitc158cae110c917372efe9ff2f080ea0357b05879 (patch)
tree90ea15bc5bd920c04b2b1791f1e4ec2488e39923 /builtin-merge.c
parent223bb84572c8b2058e175e8452913bcb1bdb0ade (diff)
parentfce87ae53883d22a9912abb2d11a926de747006e (diff)
downloadgit-c158cae110c917372efe9ff2f080ea0357b05879.tar.gz
git-c158cae110c917372efe9ff2f080ea0357b05879.tar.xz
Merge branch 'ag/rewrite_one'
* ag/rewrite_one: Fix quadratic performance in rewrite_one.
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions