summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-05-15 09:52:54 -0700
committerJunio C Hamano <gitster@pobox.com>2024-05-15 09:52:55 -0700
commit754ae502191e3f9980b8583280c48368ee667b2c (patch)
tree310f487afd8def9870af41bceb9d3fe742673857 /diff.c
parent068df18c90c335ebe28bda285e742a6408eec3b5 (diff)
parent2566a777747051eaeaaf90f3dc93bf84d2c2edeb (diff)
Merge branch 'vd/doc-merge-tree-x-option'
Doc update. * vd/doc-merge-tree-x-option: Documentation/git-merge-tree.txt: document -X
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions