merge-recursive: Fix multiple file rename across D/F conflict
[gitweb.git] / gitk-git / gitk
2007-12-02 Merge branch 'maint'
2007-12-02 Merge branch 'tt/help'
2007-12-01 Merge branch 'jc/move-gitk'
2007-11-19 Move gitk to its own subdirectory