summaryrefslogtreecommitdiff
path: root/t/t2030-unresolve-info.sh
Commit message (Expand)AuthorAgeFilesLines
* rerere forget: do not segfault if not all stages are presentJohannes Sixt2013-04-041-0/+13
* rerere forget: grok files containing NULJohannes Sixt2013-04-021-0/+12
* tests: modernise style: more uses of test_line_countStefano Lattarini2012-04-111-1/+1
* Make 'rerere forget' work from a subdirectory.Johannes Sixt2010-01-211-22/+49
* rerere forget path: forget recorded resolutionJunio C Hamano2010-01-101-0/+25
* resolve-undo: teach "update-index --unresolve" to use resolve-undo infoJunio C Hamano2009-12-251-0/+7
* resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano2009-12-251-0/+11
* resolve-undo: allow plumbing to clear the informationJunio C Hamano2009-12-251-0/+12
* resolve-undo: basic testsJunio C Hamano2009-12-251-0/+88