diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-07-30 00:18:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-30 00:18:26 -0700 |
| commit | 731ab1f55e7ba736b24708a63e93a7c8d581a4d6 (patch) | |
| tree | 602f7ddda98503fda6f2d014ca322beaf79a868f /git-merge-resolve.sh | |
| parent | Teach gitlinks to ie_modified() and ce_modified_check_fs() (diff) | |
| parent | git-gui (Windows): Change wrapper to execdir 'libexec/git-core' (diff) | |
| download | tgif-731ab1f55e7ba736b24708a63e93a7c8d581a4d6.tar.xz | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui (Windows): Change wrapper to execdir 'libexec/git-core'
git-gui (Windows): Switch to relative discovery of oguilib
git-gui: Correct installation of library to be $prefix/share
git-gui: Fix gitk search in $PATH to work on Windows
git-gui: Preserve scroll position on reshow_diff.
git-gui: Fix the Remote menu separator.
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions