summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-01-31 14:53:51 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2007-01-31 14:53:51 -0800
commitc0b4a003e4477b78d42441b8c2eec463467f313c (patch)
treeae0b1f4e22437315643c52bfb609dc2cad063903 /builtin-merge-file.c
parentMerge branch 'master' of git://linux-nfs.org/~bfields/git (diff)
downloadtgif-c0b4a003e4477b78d42441b8c2eec463467f313c.tar.xz
git main documentation: point at the user's manual.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions