On Sat, 15 Aug 2015 15:51:47 +0300 FreeMan <[email protected]> wrote:
>[...] > Conflict discovered in > '/opt/lazarus/components/leakview/languages/heaptrcview.ru.po'. > Select: (p) postpone, (df) diff-full, (e) edit, > (mc) mine-conflict, (tc) theirs-conflict, > (s) show all options: df Choose tc This can happen with .po files. Sometimes the committers forget to commit files and commit them with one of the next revisions. Mattias -- _______________________________________________ Lazarus mailing list [email protected] http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
