log tests/test-stabilize-conflict.t @ 550:362e65fc6146 stable

age author description
Tue, 11 Sep 2012 11:45:00 +0200 Pierre-Yves David evolve-cmd: fix merge error detection for external tools. stable