summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-02 12:40:19 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-04 00:19:29 -0700
commit2960a1d9eef846de9cfd9d6e32d203339d792120 (patch)
tree8dcf6d0e1a4bca4288921c573464541298efe6be /git-merge-resolve.sh
parent9a4d8fdc25d6ba08564766c6ded165212f423b61 (diff)
downloadgit-2960a1d9eef846de9cfd9d6e32d203339d792120.tar.gz
Fix read-tree --prefix=dir/.
The existing code is not wrong per-se, but it started scanning the index from a location that does not match the tree being read, and wasted cycles. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions