Add mergetool support to the classic StGit infrastructure
[stgit] / t / t0002-status.sh
2009-04-09 Catalin MarinasAdd mergetool support to the classic StGit infrastructure
2009-01-28 Catalin MarinasMerge branch 'stable'
2009-01-22 Karl HasselströmMerge branch 'stable'
2008-09-28 Karl HasselströmMerge branch 'stable'
2008-09-19 Catalin MarinasMerge branch 'stable'
2008-09-09 Catalin MarinasMerge branch 'stable'
2008-08-26 Karl HasselströmMerge branch 'stable'
2008-07-24 Karl HasselströmMerge branch 'stable'
2008-07-08 Karl HasselströmTest for specific exit code
2008-07-08 Karl HasselströmTest "stg status" with -M in stgit.diff-opts
2008-07-08 Karl HasselströmMerge branch 'stable'
2008-07-08 Karl HasselströmDon't allow extra diff options with "stg status"
2008-07-08 Karl HasselströmTest "stg status" with renames
2008-06-29 Karl HasselströmMerge branch 'stable' into stable-master-merge
2008-06-08 Catalin MarinasMerge branch 'stable'
2008-06-03 Catalin MarinasMerge branch 'stable'
2008-06-03 Karl HasselströmMerge branch 'stable' into stable-master-merge
2008-05-27 Catalin MarinasMerge branch 'stable'
2008-05-19 Catalin MarinasMerge branch 'stable'
2008-04-20 Karl HasselströmUse test_cmp instead of diff -u in the test suite
2008-04-17 Catalin MarinasMerge branch 'stable'
2008-04-14 Karl HasselströmMerge branch 'stable' into stable-master-merge
2008-03-25 Catalin MarinasMerge branch 'stable'
2007-12-19 Catalin MarinasRe-add the interactive merge
2007-12-19 Karl HasselströmRemove "stg add"
2007-12-19 Karl HasselströmFix "stg resolved" to work with new conflict representation
2007-12-19 David KågedalAsk git about unmerged files
2007-12-19 David KågedalLeave working dir and index alone after failed (conflic...
2007-12-01 Catalin MarinasCheck for disappeared newborn files in git.tree_status...
2007-10-23 Catalin MarinasAllow StGIT commands to run correctly in subdirectories
2007-09-23 David KågedalAdd some more tests of "stg status" output
2007-09-02 Karl HasselströmTest "stg status" more thoroughly
2007-08-31 David KågedalAdd basic test for stg status