Searched refs:OLDFILE (Results 1 – 15 of 15) sorted by relevance
773 enum { NEWFILE, OLDFILE } mtype; in file_write() enumerator854 mtype = OLDFILE; in file_write()981 case OLDFILE: in file_write()
724 msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE."725 msgstr "-e --ed OLDFILE����YOURFILE�ؤ�MYFILE�ˤ�������̤ʻ����ѹ�����ϡ�"766 msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"767 msgstr "����ˡ: %s [���ץ����]... MYFILE OLDFILE YOURFILE\n"
729 msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE."730 msgstr "MYFILE ��� �� YOURFILE-� OLDFILE-� ����� ��� ������� -e --ed"774 msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"775 msgstr "%s [OPTION]... MYFILE OLDFILE YOURFILE :����� ����\n"
722 msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE."724 "-e --ed ���X�� OLDFILE �� YOURFILE ����ﳡ���A�ÿ�X�i�N��\n"765 msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"766 msgstr "�Ϊk�G%s [�ﶵ]... MYFILE OLDFILE YOURFILE\n"
734 msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE."736 "-e --ed Output perubahan tanpa dimerge dari OLDFILE ke YOURFILE ke dl "777 msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"778 msgstr "Pemakaian: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
678 msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE."719 msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
680 msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE."721 msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
742 msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE."787 msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
769 msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE."818 msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
755 msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE."797 msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
752 msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE."797 msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
751 msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE."793 msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
755 msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE."802 msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
767 msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE."818 msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
316 OLDFILE for merges and edscripts so that the diffs are more likely