summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar René Scharfe <rene.scharfe@lsrfire.ath.cx>2012-05-11 16:59:25 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-11 14:31:32 -0700
commit2b189435f341cb2c7089af4f22e307405e6243df (patch)
tree3af33129d48e38a2e193687640ab5a444167f9aa /git-merge-resolve.sh
parentdir: respect string length argument of read_directory_recursive() (diff)
downloadtgif-2b189435f341cb2c7089af4f22e307405e6243df.tar.xz
dir: simplify fill_directory()
Now that read_directory_recursive() (reached through read_directory()) respects the string length limit we provide, we don't need to create a NUL-limited copy of the common prefix anymore. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions