summaryrefslogtreecommitdiff
path: root/Documentation/git-cvsimport.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-14 00:45:42 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-15 01:21:38 (GMT)
commit98efc8f3d890a0c671b7e2000e43b2e0a96b9a73 (patch)
treeac506f25b4eebedb2731b0bc470a87e94d9dde51 /Documentation/git-cvsimport.txt
parent9e9b26751a5ca7a257b3e1cfb319fe3e4efc663c (diff)
downloadgit-98efc8f3d890a0c671b7e2000e43b2e0a96b9a73.zip
git-98efc8f3d890a0c671b7e2000e43b2e0a96b9a73.tar.gz
git-98efc8f3d890a0c671b7e2000e43b2e0a96b9a73.tar.bz2
octopus: allow manual resolve on the last round.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-cvsimport.txt')
0 files changed, 0 insertions, 0 deletions