File: dos2unixdiff3

package info (click to toggle)
prcs 1.2.15-6
  • links: PTS
  • area: main
  • in suites: potato
  • size: 2,928 kB
  • ctags: 3,129
  • sloc: cpp: 16,742; ansic: 5,725; sh: 2,545; lisp: 1,812; perl: 642; lex: 351; makefile: 165; pascal: 85
file content (26 lines) | stat: -rw-r--r-- 562 bytes parent folder | download | duplicates (4)
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
#!/bin/sh

# An example of how to treat the arguments to a PRCS_MERGE_COMMAND.

#echo Merge script called with args:
#echo "Working label:  $1"
#echo "Working file:   $2"
#echo "Common label:   $3"
#echo "Commonfile:     $4"
#echo "Selected label: $5"
#echo "Selected file:  $6"
#echo "Output file:    $7"

stripctlm < "$2" > "$2.stripped"
stripctlm < "$4" > "$4.stripped"
stripctlm < "$6" > "$6.stripped"

gdiff3 -maE "-L$1" "$2.stripped" "-L$3" "$4.stripped" "-L$5" "$6.stripped" > "$7"

DVAL=$?

rm "$2.stripped"
rm "$4.stripped"
rm "$6.stripped"

exit $DVAL