aboutsummaryrefslogtreecommitdiffstats
path: root/termui
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2018-09-19 21:41:46 +0200
committerMichael Muré <batolettre@gmail.com>2018-09-19 21:45:52 +0200
commit1060acfd533c30ddcd31e4c0431d36e410e011e9 (patch)
treed919df90c38697741834f2fb8dda5f90ebc9ccea /termui
parent4c576470a8075c4752ab67573bbc64eaab69265b (diff)
downloadgit-bug-1060acfd533c30ddcd31e4c0431d36e410e011e9.tar.gz
bug: reclassify some merge error as "invalid" instead of hard error
Diffstat (limited to 'termui')
0 files changed, 0 insertions, 0 deletions