resolve-undo: record resolved conflicts in a new index extension section
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 Dec 2009 08:30:51 +0000 (00:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 26 Dec 2009 01:10:10 +0000 (17:10 -0800)
commitcfc5789...da444423232fa1533f401b5972eb3f6c
tree8a2ecdd...e946c0766d276d69b0d0693dffa1837acopy hash to clipboard (tree)
parentbe6ff81...6d9890c1875a75b96320b863dd1fe815copy hash to clipboard (diff)
Makefile
builtin-checkout.c
builtin-merge.c
builtin-read-tree.c
cache.h
read-cache.c
resolve-undo.c [new file with mode: 0644]
resolve-undo.h [new file with mode: 0644]