convert unmerge_cache to take struct pathspec
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Sun, 14 Jul 2013 08:35:51 +0000 (15:35 +0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Jul 2013 17:56:08 +0000 (10:56 -0700)
commit5ab0651...a71a8bd128a2aea38ddb537870d3ea2b
tree4f7b5a7...fece7747e97ee537e3e0f4cbd6ece1a2copy hash to clipboard (tree)
parent480ca64...9ed0981311b8aef2fbaa89d024b881eecopy hash to clipboard (diff)
rerere.c
resolve-undo.c
resolve-undo.h