-c -case | ignore upper/lower Case differences |
-eauto | EOL AutoMode enabled |
-ed | EOLs written for DOS |
-em | EOLs written for MacOS |
-eu | EOLs written for Unix |
-enauto | Encoding AutoMode enabled |
-enf spec | Encoding for files(1st, 2nd, and Parent) |
| For Example: -enfUnicodeLittle |
-en1 spec | Encoding for 1st files |
| For Example: -en1UnicodeLittle |
-en2 spec | Encoding for 2nd files |
| For Example: -en2UnicodeLittle |
-enp spec | Encoding for Parent files |
| For Example: -enpUnicodeLittle |
-ens spec | Encoding for Saved files(Dif, RCS, MergeResult, and HTML) |
| For Example: -ensUnicodeLittle |
-fxxx,yyy | ignore Field in columns xxx through yyy |
| For Example: -f73,80 ignores columns 73 through 80 |
| May be specified twice for 2 fields |
-h -help | display this Help message |
-k | ignore blanK lines(inserted or deleted) |
-pr | Promote merge |
-q RE -ql RE | Quietly ignore changed, inserted, or deleted lines matching regular expression RE |
| ie. -ql^[:blank:]*//.*$ |
-qp RE | Quietly ignore parts of lines matching regular expression RE |
| ie. -qp//.*$ |
-qb RE | Quietly ignore blocks of lines matching regular expression RE |
| ie. -qb/\*.*?\*/ |
| Upto 6 -q options are accumulated |
-s -sure | SureMerge(3-Way) |
-tab tt | expand tabs at tt spaces(applied for -f) |
| tt defaults to 8, ie. -t4 |
-w -white | ignore all White space differences |
-wl | ignore Leading White space differences |
-we | ignore Embedded White space differences |
-wt | ignore Trailing White space differences |
-x nn | eXpand attention focus by nn lines |
| For Example: -x2 eXpands attention focus by 2 lines |