diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-01-21 04:36:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-21 04:36:16 (GMT) |
| commit | 36a189c86e4a4ad75a75f598eedfe2defab3cbf3 (patch) | |
| tree | 50fb45f3a88aa9ad61e7ba2e0b194681aecfde3e /git-merge-stupid.sh | |
| parent | ce33288ea6b81a2f4f5aecd72177bcc8174562ae (diff) | |
| parent | 6caaf2daf0ea50ff99009b94f24252b8fa747e64 (diff) | |
| download | git-36a189c86e4a4ad75a75f598eedfe2defab3cbf3.zip git-36a189c86e4a4ad75a75f598eedfe2defab3cbf3.tar.gz git-36a189c86e4a4ad75a75f598eedfe2defab3cbf3.tar.bz2 | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: Correct encoding of glossary/fr.po to UTF-8
git-gui: Consolidate hook execution code into a single function
git-gui: Correct window title for hook failure dialogs
git-gui: Honor the standard commit-msg hook
Diffstat (limited to 'git-merge-stupid.sh')
0 files changed, 0 insertions, 0 deletions