summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2017-06-29 15:19:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-30 10:56:37 -0700
commitc2d4b4cd06f19e89ad242c2de542821edc01c01f (patch)
treeaf3b299b8d8cc7f8ca34b471c9e7823c7e795b55 /Documentation/git-merge-index.txt
parentGit 2.13.2 (diff)
downloadtgif-c2d4b4cd06f19e89ad242c2de542821edc01c01f.tar.xz
merge-recursive: use DIFF_XDL_SET macro
Instead of implementing this on our own, just use a convenience macro. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions