Junio C Hamano e92ea62425 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

2007-08-26 17:29:26 -07:00

..

lib

Merge branch 'master' of git://repo.or.cz/git-gui

2007-08-26 17:29:26 -07:00

.gitignore

Merge branch 'master' of git://repo.or.cz/git-gui

2007-05-07 23:51:00 -04:00

git-gui.sh

Merge branch 'master' of git://repo.or.cz/git-gui

2007-08-26 17:29:26 -07:00

GIT-VERSION-GEN

Merge branch 'master' of git://repo.or.cz/git-gui

2007-06-11 00:52:43 -07:00

Makefile

Merge branch 'master' of git://repo.or.cz/git-gui

2007-06-28 21:32:41 -07:00