1c5bfa7ce4de088e3b942463bb11cdc553a92b97 be76784bd21e55dd4d035a7a46396d8babd746af Neil Brown <neilb@suse.de> 1269412272 +1100	pull . devel: Fast-forward
be76784bd21e55dd4d035a7a46396d8babd746af d3898fd5cc8b83aaedb2d1952e3480f0e459504c Neil Brown <neilb@suse.de> 1269417150 +1100	commit: Update wiggle.spec for new version and location.
d3898fd5cc8b83aaedb2d1952e3480f0e459504c b72e6d6e9a58047ca1639c28c95aa959fada6714 Neil Brown <neilb@suse.de> 1269417182 +1100	commit: Improve parsing of diff3 output.
b72e6d6e9a58047ca1639c28c95aa959fada6714 3f524fcbe3626e5b760ebac76e978232fc64c79d Neil Brown <neilb@suse.de> 1269417819 +1100	commit: Add --no-ignore option
