Hello, I have to merge code changes on a large directory tree. The top-level directory layout is a follows:
- DIR_V1: (version 1 source tree) - DIR_V1_MOD: (version 1 source tree with my local modifications) - DIR_V2: (version 2 source tree. It is based on DIR_V1) I invoke meld as follows: meld DIR_V1 DIR_V1_MOD DIR_V2 Now I want the see the changes between DIR_V1 <=> DIR_V1_MOD and merge them into DIR_V2 I was assuming that meld colors the files (to indicate the status) in the three columns as follows: LEFT colum: LEFT <=> MIDDLE diff status RIGHT colum: MIDDLE <=> RIGHT diff status MID colum: Superset of MIDDLE <=> LEFT + MIDDLE <=> RIGHT diff status This way I could navigate from one change to the next in the left column to get to all my DIR_V1 <=> DIR_V1_MOD changes. If I do a 3-way file comparison it seems to behave like this. Can someone please explain the behavior for 3-way directory/file diffs or point me to the documentation for this? Is there a way to get meld to behave as described above? Thanks, Oliver Geschaeftsfuehrer/Managing Director: Toshihiko Tanaka Sitz/Seat: Langen, Hessen; Registergericht/Commercial Register: Offenbach/Main HRB 48005 This e-mail and any attachment contains information which is private and confidential and is intended for the addressee only. If you are not an addressee, you are not authorised to read, copy or use the e-mail or any attachment. If you have received this e-mail in error, please notify the sender by return e-mail and then delete it. _______________________________________________ meld-list mailing list [email protected] https://mail.gnome.org/mailman/listinfo/meld-list
