Steve Borho avatar Steve Borho committed 980b9c4

docdiff: add RTF as a supported format of MS Word diff and merge

Comments (0)

Files changed (2)

     'doc'  : ('diff-doc.js', 'merge-doc.js'),    # MS Word
     'docx' : ('diff-doc.js', 'merge-doc.js'),
     'docm' : ('diff-doc.js', 'merge-doc.js'),
+    'rtf'  : ('diff-doc.js', 'merge-doc.js'),
     'ppt'  : ('diff-ppt.js',),                   # MS PowerPoint
     'pptx' : ('diff-ppt.js',),
     'pptm' : ('diff-ppt.js',),

win32/mergepatterns.rc

 [merge-patterns]
 **.doc = docdiff
+**.rtf = docdiff
 **.docx = docdiff
 **.docm = docdiff
 **.ods = docdiff
 
 [diff-patterns]
 **.doc = docdiff
+**.rtf = docdiff
 **.docx = docdiff
 **.docm = docdiff
 **.ppt = docdiff
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.