Valid WORDs are: literal, shell, shell - always, c, escape. quoting - style = WORD output file names using quoting style WORD. T - set - time Likewise, assuming local time. Z - set - utc Set times of patched files, assuming diff uses UTC ( GMT ).
E - remove - empty - files Remove output files that are empty after patching. D NAME - ifdef = NAME Make merged if - then - else output using NAME. r FILE - reject - file = FILE Output rejects to FILE. Output options: -o FILE - output = FILE Output patched files to FILE. i PATCHFILE - input = PATCHFILE Read patch from PATCHFILE instead of stdin. R - reverse Assume patches were created with old and new files swapped. N - forward Ignore patches that appear to be reversed or already applied. u - unified Interpret the patch as a unified difference. n - normal Interpret the patch as a normal difference. e - ed Interpret the patch as an ed script. c - context Interpret the patch as a context difference. l - ignore - whitespace Ignore white space changes between patch and input. F LINES - fuzz LINES Set the fuzz factor to LINES for inexact matching. ] Input options: -p NUM - strip = NUM Strip NUM leading components from file names. Usage : C:\ Program Files \ WinMerge \ GnuWin32 \ bin \ patch.
0 kommentar(er)
