summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-05 20:54:25 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-06 09:12:32 (GMT)
commit9eba845f2088c33de3efe04492b9e33114c5fb52 (patch)
treea3ea7d2776e689a15c1cf933eb88f89d4ace3df7 /git-merge-ours.sh
parent54c2533da0228244bbde7f94abfdb0a7fbb859c1 (diff)
downloadgit-9eba845f2088c33de3efe04492b9e33114c5fb52.zip
git-9eba845f2088c33de3efe04492b9e33114c5fb52.tar.gz
git-9eba845f2088c33de3efe04492b9e33114c5fb52.tar.bz2
Further Debian split fixes.
The doc installation was flattened, breaking links to howto/. Silly cut&paste error made git-doc depend on tk8.4. Doh. Move most of the documentation (except manuals) to git-doc. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions