summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-15 17:02:06 -0800
committerJunio C Hamano <junkio@cox.net>2007-02-15 17:03:11 -0800
commitefa13f7b7ea1605deab3a6478fa0d0706c828170 (patch)
treef56e6ddc8cb6e359bc199cd72eb7f40aa0ae2995 /git-merge.sh
parent204d409247e7bbc7848569462aa11a87e373c8d6 (diff)
downloadgit-efa13f7b7ea1605deab3a6478fa0d0706c828170.tar.gz
pretend-sha1: grave bugfix.
We stashed away objects that we pretend to have, but did not save the actual data. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions