summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Steffen Prohaska <prohaska@zib.de>2017-11-22 09:58:14 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-24 16:19:19 +0900
commitff4c9b413a54dd62d155c32188f5a17b33eb2853 (patch)
tree75e705944afb620dacd6467fb1e631929cbf8aea /Documentation/technical/trivial-merge.txt
parentGit 2.12.5 (diff)
downloadtgif-ff4c9b413a54dd62d155c32188f5a17b33eb2853.tar.xz
doc: Mention info/attributes in gitrepository-layout
Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions