summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2013-04-19 09:08:43 +1000
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-18 16:28:27 -0700
commit9d3f002f21f78576f3c31ae94ce78de54e305c95 (patch)
tree8523cf6f3c1caf0167b6518b1c48072c6157e39c /Documentation/git-merge-one-file.txt
parentpretty-formats.txt: wrap long lines (diff)
downloadtgif-9d3f002f21f78576f3c31ae94ce78de54e305c95.tar.xz
pretty: share code between format_decoration and show_decorations
This also adds color support to format_decorations() Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions