summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-15 15:30:49 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-15 16:27:40 -0800
commit15368e1836970d87b5f29635b04c1d2144954f1f (patch)
tree137a0d8e0ac4b0ff004fab94eca63a022803adcc /merge-recursive.h
parentMerge git://git.kernel.org/pub/scm/gitk/gitk (diff)
parentGit 1.7.3.4 (diff)
downloadtgif-15368e1836970d87b5f29635b04c1d2144954f1f.tar.xz
Sync with 1.7.3.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions