diff options
author | Junio C Hamano <junkio@cox.net> | 2006-12-03 04:26:58 +0300 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-12-03 04:26:58 +0300 |
commit | 278fcd7debf19c1efee18b32f8867becb18d1a22 (patch) | |
tree | 2cb716a1c55fc0f9af01138cd5d0ba843218fb03 /xdiff/xmerge.c | |
parent | 3683dc5a9afaf88d00e55c9e6c67a2160ca7fc9c (diff) | |
parent | 6173c197c9a23fa8594f18fd2c856407d4af31c1 (diff) |
Merge branch 'maint'
* maint:
git-svn: avoid fetching files twice in the same revision
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions