summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2009-03-29 22:42:27 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-29 19:56:26 -0700
commit63801da88d8638eb6cf26d6305a721ad3731e216 (patch)
tree9440c1c2fc847ed7841446ef627dc0f51c1575a1 /Documentation/git-merge-file.txt
parentclose_sha1_file(): make it easier to diagnose errors (diff)
downloadtgif-63801da88d8638eb6cf26d6305a721ad3731e216.tar.xz
import-zips: fix thinko
Embarrassingly, the common prefix calculation did not work properly, due to a mistake in the assignment: instead of assigning the dirname of the current file name, the dirname of the current common prefix needs to be assigned to common prefix, when the current prefix does not match the current file name. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions