2023-04-17 17:06:51 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
2023-09-28 19:36:55 +02:00
|
|
|
set -e
|
|
|
|
|
2023-04-17 17:06:51 +02:00
|
|
|
for i in "PendingRecording" "Recording" "Recorder"; do
|
|
|
|
diff3 -m ../Suckless$i.java base/$i.java new/$i.java > Suckless$i.java && mv Suckless$i.java ..
|
|
|
|
done
|
|
|
|
diff3 -m ../internal/encoder/SucklessEncoderImpl.java base/EncoderImpl.java new/EncoderImpl.java > SucklessEncoderImpl.java && mv SucklessEncoderImpl.java ../internal/encoder/SucklessEncoderImpl.java
|