diff options
| author |  Johannes Sixt <johannes.sixt@telecom.at> | 2008-08-04 22:09:46 +0200 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2008-08-04 17:38:17 -0700 |
| commit | 9534c9fb31dfe4c5c367042c97a160c42b1eefdf (patch) | |
| tree | c4592a6b7c2db0438299000c4ed86c46355f7dab /Documentation/git-merge.txt | |
| parent | git-gui: add a part about format strings in po/README (diff) | |
| download | tgif-9534c9fb31dfe4c5c367042c97a160c42b1eefdf.tar.xz | |
git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core'
The new execdir is two levels below the root directory, while
the old execdir 'bin' was only one level below. This commit
adapts the discovery of oguilib that uses relative paths
accordingly. We determine whether we have the extra level in the same
way in which the Makefile defines sharedir, i.e. whether the last
directory part is 'git-core'.
Inspired-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions