Merge branch 'mm/conflict-advice'
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:42:59 +0000 (14:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:42:59 +0000 (14:42 -0800)
commit71b3ef1...fa0aade4a514c51b83438858a4a3c03b
tree6cea821...ecc0e70c8f19e04c51327deda93672d3copy hash to clipboard (tree)
parentf922df8...55675aafaea96f3715c9473c63d2ca47copy hash to clipboard (diff)
parentd38a30d...7dd54c5c6883af1de1a03ec7d523cee5copy hash to clipboard (diff)
Documentation/config.txt
advice.c
advice.h
builtin-commit.c
builtin-merge.c
builtin-revert.c