Paul Mackerras 887a791f11 gitk: Improve cherry-pick error handling ... This adds to the regexps that are used to work out what sort of error we encountered in trying to do a cherry-pick so that it recognizes some additional common error messages. It adds a confirmation dialog when the error is a merge conflict so the user can choose whether or not to run git citool. Finally, it arranges to update the display after a cherry-pick failed so that any local changes made by the cherry-pick become visible. Signed-off-by: Paul Mackerras <paulus@samba.org>		2008-11-08 21:37:09 +11:00
po	gitk: Regenerate .po files	2008-10-18 22:23:33 +11:00
Makefile	gitk: Makefile/install: force permissions when installing files and dirs	2008-05-02 22:54:02 +10:00
gitk	gitk: Improve cherry-pick error handling	2008-11-08 21:37:09 +11:00