blob: 7c677fa4ab15e5d71ba5130ff32bccbec65856ad (
plain)
1
2
3
4
5
6
|
python pyMergeChanges.py [-arh] <Input File> <Output File>
Options:
-a: accept all added, deleted and replaced
-r: reject all added, deleted and replaced
-h: remove all highlights
If no option is given, runs interactively.
|