aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-10 17:56:19 -0700
committerJunio C Hamano <junkio@cox.net>2005-09-10 18:30:41 -0700
commit2276aa6c098a0337bc2bec49742e332bdd1b802c (patch)
treebc43b357a46843c2efa0d1e3b4f55fe667b09824 /cache.h
parent91063bbc6c4187184e94ebc4ab2b807e6d53cd0a (diff)
downloadgit-2276aa6c098a0337bc2bec49742e332bdd1b802c.tar.gz
git-2276aa6c098a0337bc2bec49742e332bdd1b802c.tar.xz
Use Daniel's read-tree in the merge strategy 'resolve'.
And rename the one Linus kept calling stupid, 'stupid'. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'cache.h')
0 files changed, 0 insertions, 0 deletions