t / t5100 / msg0017on commit difftool: fallback on merge.guitool (6c22d71)
   1New content here
   2