Merge branch 'jc/cache-unmerge'
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:44:31 +0000 (14:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:46:35 +0000 (14:46 -0800)
commit6751e0471df1bdc4a1d5e5a3929a531c74e95aeb
tree4f25445b5ceb6f83473f60a36c7d09d2e1f0378e
parent030b1a77f72a7e3307c7d7881ae570ca1c8ed877
parentdea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69
Merge branch 'jc/cache-unmerge'

* jc/cache-unmerge:
  rerere forget path: forget recorded resolution
  rerere: refactor rerere logic to make it independent from I/O
  rerere: remove silly 1024-byte line limit
  resolve-undo: teach "update-index --unresolve" to use resolve-undo info
  resolve-undo: "checkout -m path" uses resolve-undo information
  resolve-undo: allow plumbing to clear the information
  resolve-undo: basic tests
  resolve-undo: record resolved conflicts in a new index extension section
  builtin-merge.c: use standard active_cache macros

Conflicts:
builtin-ls-files.c
builtin-merge.c
builtin-rerere.c
Makefile
builtin-checkout.c
builtin-ls-files.c
builtin-merge.c
builtin-read-tree.c
builtin-rerere.c
builtin-update-index.c
cache.h
read-cache.c
rerere.c
rerere.h