aboutsummaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-19 17:01:35 -0700
committerJunio C Hamano <junkio@cox.net>2006-06-19 18:43:49 -0700
commitd281786fcd6d0df47dd46e415f1a804b2e81ed9b (patch)
treea9844a33aa2c0bc8c58c8fe3e6f272362c6fe49a /merge-index.c
parent0da4677149b433e5424537c6acf45bd4d2f7a6df (diff)
downloadgit-d281786fcd6d0df47dd46e415f1a804b2e81ed9b.tar.gz
git-d281786fcd6d0df47dd46e415f1a804b2e81ed9b.tar.xz
xdiff: minor changes to match libxdiff-0.21
This reformats the change 621c53cc082299eaf69e9f2dc0274547c7d87fb0 introduced to match what upstream author implemented in libxdiff-0.21 without changing any logic (hopefully ;-). This is to help keep us in sync with the upstream. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions