summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2018-05-13 02:24:17 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-14 11:02:01 +0900
commit0fbdb52f9eb1b73cb207891e00ce18c2d20ed6c9 (patch)
tree0e15d012733174098e8dd35d99b965222daca7f5 /Documentation/git-merge-one-file.txt
parentt0000: annotate with SHA1 prerequisite (diff)
downloadtgif-0fbdb52f9eb1b73cb207891e00ce18c2d20ed6c9.tar.xz
t1007: annotate with SHA1 prerequisite
Since this is a core test that tests basic functionality, annotate the assertions that have dependencies on SHA-1 with the appropriate prerequisite. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions