summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2008-08-10 00:02:08 -0700
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2008-08-10 00:02:08 -0700
commit1c1fe1005c9dacc05a34eb892ae20ebb1904a33b (patch)
treec993789618d5d9d2993d8e2a15bb95c2d8a93c27 /Documentation/git-merge.txt
parentgit-gui: Adapt discovery of oguilib to execdir 'libexec/git-core' (diff)
downloadtgif-1c1fe1005c9dacc05a34eb892ae20ebb1904a33b.tar.xz
git-gui 0.11
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions