summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-10-27 08:23:05 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-29 10:17:02 +0900
commit2c31a83037cd2df1f7ab3db8fbcf42501395179d (patch)
tree824550b8569fb4dba904f3c620a993145193c6e8 /merge.c
parentconfig.txt: move gui-config.txt to config/ (diff)
downloadtgif-2c31a83037cd2df1f7ab3db8fbcf42501395179d.tar.xz
config.txt: move guitool.* to a separate file
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 'merge.c')
0 files changed, 0 insertions, 0 deletions