summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-12-08 01:34:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-12-08 01:34:14 (GMT)
commitf371d3ea3ca7933df787230f2eb9b67901bde9d3 (patch)
treeb3f8535e3bcce98707864611907e86e2297cb257 /git-merge-octopus.sh
parent0e32126f04f6ad64826d4c145f2a1a9685e0910d (diff)
downloadgit-f371d3ea3ca7933df787230f2eb9b67901bde9d3.zip
git-f371d3ea3ca7933df787230f2eb9b67901bde9d3.tar.gz
git-f371d3ea3ca7933df787230f2eb9b67901bde9d3.tar.bz2
Point "stale" 1.6.0.5 documentation from the main git documentation pagev1.6.1-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions