summaryrefslogtreecommitdiff
path: root/daemon.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-17 00:46:35 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-17 01:14:44 -0800
commit38477d9e6055e3572b465ec3f8e716164111683d (patch)
tree430af1096526421b6d69d6f834e15f8f7a9df5fe /daemon.c
parenta7f196a74650e45ce240754e2caa483752651063 (diff)
downloadgit-38477d9e6055e3572b465ec3f8e716164111683d.tar.gz
Fix mis-mark-up in git-merge-file.txt documentation
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'daemon.c')
0 files changed, 0 insertions, 0 deletions