Andrew's git / gitweb.git / t/t5100/msg0003
?
t / t5100 / msg0003on commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1Here is a patch from A U Thor.  This addresses the issue raised in the
   2message:
   3
   4From: Nit Picker <nit.picker@example.net>
   5Subject: foo is too old
   6Message-Id: <nitpicker.12121212@example.net>
   7
   8Hopefully this would fix the problem stated there.
   9