Merge branch 'jc/conflict-marker-size'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2010 04:28:51 +0000 (20:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2010 04:28:51 +0000 (20:28 -0800)
commit06dbc1e...5768618337bf11e5f64c4f9f14a68008
tree049d23a...b372994b77c192df0537b232daa10d07copy hash to clipboard (tree)
parentdf91d0e...d30ddc9bf2c55e3a63be9cb5318a409acopy hash to clipboard (diff)
parent8588567...96490b8d236b1bc13f9bcb0dfa118efecopy hash to clipboard (diff)
archive.c
builtin-merge-file.c
builtin-pack-objects.c
convert.c
ll-merge.c
ll-merge.h
rerere.c
xdiff/xdiff.h
xdiff/xmerge.c