summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2013-03-13 18:42:51 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-16 22:11:02 -0700
commit3b691cccb02e660002a7ff414ad21ddac932dc6c (patch)
tree0f8050bc5ae4a49887cc336015244c1b35023cf5 /Documentation/git-mergetool.txt
parentwt-status: split wt_status_state parsing function out (diff)
downloadtgif-3b691cccb02e660002a7ff414ad21ddac932dc6c.tar.xz
wt-status: move wt_status_get_state() out to wt_status_print()
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-mergetool.txt')
0 files changed, 0 insertions, 0 deletions