summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2015-07-29 13:18:37 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-07-29 13:31:51 -0700
commit14691e382774d459d0103feb57c07a58f9221e4a (patch)
tree058262df5853c5a3a369e268defadb5bcdf79277 /Documentation/merge-options.txt
parentGit 2.5 (diff)
downloadtgif-14691e382774d459d0103feb57c07a58f9221e4a.tar.xz
parse-options: align curly braces for all options
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions