Print conflict details with the new infrastructure (bug #11181)
[stgit] / t / t3101-reset-hard.sh
2008-09-28 Karl HasselströmMerge branch 'stable'
2008-09-21 Karl HasselströmAdd a --hard flag to stg reset