summaryrefslogtreecommitdiff
path: root/t/t2030-unresolve-info.sh
AgeCommit message (Expand)Author
2013-04-04rerere forget: do not segfault if not all stages are presentJohannes Sixt
2013-04-02rerere forget: grok files containing NULJohannes Sixt
2012-04-11tests: modernise style: more uses of test_line_countStefano Lattarini
2010-01-21Make 'rerere forget' work from a subdirectory.Johannes Sixt
2010-01-11rerere forget path: forget recorded resolutionJunio C Hamano
2009-12-26resolve-undo: teach "update-index --unresolve" to use resolve-undo infoJunio C Hamano
2009-12-26resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano
2009-12-26resolve-undo: allow plumbing to clear the informationJunio C Hamano
2009-12-26resolve-undo: basic testsJunio C Hamano