File: merge-command

package info (click to toggle)
prcs 1.3.3-4
  • links: PTS
  • area: main
  • in suites: sarge
  • size: 4,128 kB
  • ctags: 3,354
  • sloc: cpp: 17,486; ansic: 8,132; sh: 4,710; perl: 2,729; lisp: 1,816; tcl: 1,142; lex: 354; makefile: 225; pascal: 85
file content (14 lines) | stat: -rwxr-xr-x 358 bytes parent folder | download | duplicates (6) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
 
#!/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"

exec diff3 -maE "-L$1" "$2" "-L$3" "$4" "-L$5" "$6" > "$7"