Searched hist:174841 (Results 1 - 1 of 1) sorted by relevance
| /freebsd-9.3-release/usr.sbin/mergemaster/ | ||
| H A D | mergemaster.sh | diff 174841 Fri Dec 21 17:34:26 MST 2007 dougb 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> |
Completed in 47 milliseconds