summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Taylor Blau <me@ttaylorr.com>2020-05-13 15:59:51 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-05-18 12:51:11 -0700
commit1f1304d4976f54b1afa5d71b55e41c6c1b5f9ac1 (patch)
tree4dd09d58f465603e8b771f8cbfd070e6a29fb4ce /Documentation/git-mergetool.txt
parentcommit-graph.c: simplify 'fill_oids_from_commits' (diff)
downloadtgif-1f1304d4976f54b1afa5d71b55e41c6c1b5f9ac1.tar.xz
t5318: reorder test below 'graph_read_expect'
In the subsequent commit, we will introduce a dependency on 'graph_read_expect' from t5318.7. Preemptively move it below 'graph_read_expect()'s definition so that the test can call it. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions