16 Jul
2013
16 Jul
'13
10:37 a.m.
-<<<<<<< HEAD -"PO-Revision-Date: 2013-07-13 04:49+0200\n" -======= -"PO-Revision-Date: 2013-07-04 00:10+0200\n" ->>>>>>> 598685e6c5992355de35b4345e91eb4e50b9f07e +"PO-Revision-Date: 2013-07-13 05:00+0200\n"
[...] -#: attrib.rc:27 cmd.rc:322 +#: attrib.rc:27 cmd.rc:325
These look wrong: there is currently no conflict in the checked-in PO file and there should not be any line-number changes in the patch. So it won't apply to the current Git repository. Something must have happened when you rebased or generated the diff.
--
Francois Gouget fgouget@free.fr http://fgouget.free.fr/
In a world without fences who needs Gates?