Doug Barton f29fe35ae8 In the following scenario: ... 1. Start mergemaster 2. Interrupt it 3. < Somehow the temproot directory disappears > 4. mergemaster -r Many bad things can happen, especially if the -i option is in use. Therefore, add a check to make sure it still exists before we start comparing files. Brought to my attention by: PR: bin/40538 Submitted by: Cyrille Lefevre <cyrille.lefevre@laposte.net>		2007-12-21 19:34:26 +00:00
..
Makefile
mergemaster.8	Add missed SYNOPSIS flag for auto upgrade.	2006-04-30 22:09:47 +00:00
mergemaster.sh	In the following scenario:	2007-12-21 19:34:26 +00:00