summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-07-07 02:17:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-07-07 02:17:23 -0700
commit17d778e710f9dacc770b5790e792b85cdba75a9d (patch)
tree1a3a97aa0c6d5cd86505e12ab2fc58e4f5bf849f /ll-merge.c
parentMerge branch 'db/no-git-config' (diff)
parentEliminate an unnecessary chdir("..") (diff)
downloadtgif-17d778e710f9dacc770b5790e792b85cdba75a9d.tar.xz
Merge branch 'dr/ceiling'
* dr/ceiling: Eliminate an unnecessary chdir("..") Add support for GIT_CEILING_DIRECTORIES Fold test-absolute-path into test-path-utils Implement normalize_absolute_path Conflicts: cache.h setup.c
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions