Kiln » TortoiseHg » TortoiseHg
Clone URL:  
/ win32
mergepatterns.rc
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
[merge-patterns] **.doc = docdiff **.docx = docdiff **.docm = docdiff **.ods = docdiff **.odt = docdiff **.sxw = docdiff # If you have Telelogic Rhapsody DifMerge, enable these #**.sbs = rhapsody_diffmerge #**.rpy = rhapsody_diffmerge #**.cmp = rhapsody_diffmerge [diff-patterns] **.doc = docdiff **.docx = docdiff **.docm = docdiff **.ppt = docdiff **.pptx = docdiff **.pptm = docdiff **.xls = docdiff **.xlsx = docdiff **.xlsm = docdiff **.xlsb = docdiff **.xlam = docdiff **.ods = docdiff **.odt = docdiff **.sxw = docdiff **.nb = docdiff # If you have Telelogic Rhapsody DifMerge, enable these #*.sbs = rhapsody_diffmerge #*.rpy = rhapsody_diffmerge #*.cmp = rhapsody_diffmerge