I am improving my friend's LaTeX document at folder 1/2, while he is editing the folder 1/1.
The initial contents of the folders is the same.
How can you meld the two folders to one such that all files are melded?
You're wanting to find the differences in files in two folders and merge the changes?
If you're looking for a GUI utility you can use FileMerge which can be found at
If you're looking for something faster and nicer check out Changes.app - it's not cheap but has been worth the price of admission several times over for me.
If you want to do it via the command line you can use
Since the mac is running a version of unix, you can use all of the tried, tested and true commands from the established UNIX heritage.
The following code is made by Git-community
You can then run
to achieve what I want.