Merge commit '84b65f54ea5ed2d044bc85880b452e5a5d2d8096' into HEAD
commitfda40c05e84accb95bd59046811c4ef384aa9d26
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 20 Apr 2009 12:57:37 +0000 (20 14:57 +0200)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Sun, 7 Feb 2010 22:06:31 +0000 (7 23:06 +0100)
tree1b4bf3b448d5346aeb1508b722061dff76a065a1
parentca26a063e54e125b5cc5dbc2b6e52393cc348cb7
parent34c8453aa4597a611e38ab7aa78dbb55db8129ba
Merge commit '84b65f54ea5ed2d044bc85880b452e5a5d2d8096' into HEAD

Conflicts:
builtin-log.c
diff.h
Documentation/config.txt
builtin-log.c
diff.c
diff.h