summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-08-22 18:05:57 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-12 13:54:16 -0700
commite108551a7c028b96ec9fec2b2329227f5469de0b (patch)
treed23daea46c805acea47a346a3e279d8f2f2cce23 /git-merge-resolve.sh
parentconfig.txt: move fetch part out to a separate file (diff)
downloadtgif-e108551a7c028b96ec9fec2b2329227f5469de0b.tar.xz
config.txt: move format part out 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 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions