From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Aug 2007 00:29:26 +0000 (-0700)
Subject: Merge branch 'master' of git://repo.or.cz/git-gui
X-Git-Tag: v1.5.3-rc7~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e92ea62425fb89713bc47241af29a79f5f191cc6;p=git.git

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
---

e92ea62425fb89713bc47241af29a79f5f191cc6