Andrew's git / gitweb.git / diff
?
Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 Aug 2007 18:36:04 +0000 (11:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 Aug 2007 18:36:04 +0000 (11:36 -0700)
* 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
[PATCH] gitk: Make the date/time display configurable
[PATCH] gitk: Let user easily specify lines of context in diff view
gitk: Fix warning when removing a branch

Trivial merge