X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=dive.c;h=3fa09bd10c05982a9972c0db8a58a76314543f59;hp=31be3291d76c13647b4dec8607b51636a26eec81;hb=af290d5eb281662d336b8186a9df1a489d78ec9d;hpb=ce6c3ee56d372e2ef8386a065fbf4bce4cfa0ffc diff --git a/dive.c b/dive.c index 31be329..3fa09bd 100644 --- a/dive.c +++ b/dive.c @@ -559,6 +559,7 @@ struct dive *try_to_merge(struct dive *a, struct dive *b) MERGE_TXT(res, a, b, notes); MERGE_TXT(res, a, b, buddy); MERGE_TXT(res, a, b, divemaster); + MERGE_MAX(res, a, b, rating); MERGE_MAX(res, a, b, number); MERGE_MAX(res, a, b, maxdepth.mm); res->meandepth.mm = 0;