![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Aug 2007 00:29:26 +0000 (17:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Aug 2007 00:29:26 +0000 (17:29 -0700) | ||
| commit | e92ea62425fb89713bc47241af29a79f5f191cc6 | |
| tree | a027f4d97331623b3a4d99eeea5e14557af990e3 | tree | snapshot |
| parent | 09b0d9dde03df1432df06dcfcc20d8abecccb860 | commit | diff |
| parent | c80d25dbce759a8483ffc1f085fdf4cd63cf9f05 | commit | diff |
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui:
git-gui: Correct 'git gui blame' in a subdirectory
git-gui: Do not offer to stage three-way diff hunks into the index
git-gui: Refactor diff pane popup support for future improvements
git-gui: Fix "unoptimized loading" to not cause git-gui to crash
git-gui: Paper bag fix "Stage Hunk For Commit" in diff context menu
git-gui: Allow git-merge to use branch names in conflict markers
git-gui: Fix window manager problems on ion3
* 'master' of git://repo.or.cz/git-gui:
git-gui: Correct 'git gui blame' in a subdirectory
git-gui: Do not offer to stage three-way diff hunks into the index
git-gui: Refactor diff pane popup support for future improvements
git-gui: Fix "unoptimized loading" to not cause git-gui to crash
git-gui: Paper bag fix "Stage Hunk For Commit" in diff context menu
git-gui: Allow git-merge to use branch names in conflict markers
git-gui: Fix window manager problems on ion3
| git-gui/git-gui.sh | diff1 | | | | blob | history |
| git-gui/lib/class.tcl | diff1 | | | | blob | history |
| git-gui/lib/merge.tcl | diff1 | | | | blob | history |