summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-04-19 10:57:48 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-20 10:44:14 +0900
commit04550ab56f3191a27cb8e4f10a7398b396094f58 (patch)
tree27255aa1604bfca30c1b638c04bc662ea7a58157 /Documentation/git-merge-file.txt
parentMerge branch 'svn/authors-prog-2' of git://bogomips.org/git-svn (diff)
downloadtgif-04550ab56f3191a27cb8e4f10a7398b396094f58.tar.xz
directory rename detection: basic testcases
Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions