Junio C Hamano b43b73666b Merge git://git.kernel.org/pub/scm/gitk/gitk ... * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix linehtag undefined error with file highlighting gitk: Fix commit encoding support gitk: Fix transient windows on Win32 and MacOS gitk: Add accelerators to frequently used menu commands gitk: Implement a user-friendly Edit View dialog gitk: Improve cherry-pick error handling gitk: Make cherry-pick call git-citool on conflicts gitk: Make gitk dialog windows transient gitk: Add Return and Escape bindings to dialogs gitk: Cope with unmerged files in local changes gitk: Make "show origin of this line" work on fake commits gitk: Unify handling of merge diffs with normal 2-way diffs gitk: Make the background color of marked lines configurable gitk: Add a menu item to show where a given line comes from gitk: Fix some off-by-one errors in computing which line to blame gitk: Allow starting gui blame for a specific line gitk: Fix file list context menu for merge commits gitk: Allow forcing branch creation if it already exists		2008-11-13 08:28:51 -08:00
..
po	Merge git://git.kernel.org/pub/scm/gitk/gitk	2008-10-20 22:16:09 -07:00
gitk	Merge git://git.kernel.org/pub/scm/gitk/gitk	2008-11-13 08:28:51 -08:00
Makefile	Merge git://git.kernel.org/pub/scm/gitk/gitk	2008-05-14 21:27:55 -07:00