advice: Introduce error_resolve_conflict
authorRamkumar Ramachandra <artagnon@gmail.com>
Thu, 4 Aug 2011 10:38:59 +0000 (16:08 +0530)
committerJunio C Hamano <gitster@pobox.com>
Thu, 4 Aug 2011 22:40:41 +0000 (15:40 -0700)
commit38ef61c...de8aea0864e898d37ce3213a5771c59e
tree1540721...0363764b1b02265ea54e48b485588a11copy hash to clipboard (tree)
parent13b70d2...d96a79fb439c6b4fc0e8058b1762bae2copy hash to clipboard (diff)
advice.c
advice.h
builtin/revert.c