merge-recursive: move more is_dirty handling to merge_content
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:17 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commitbd42380...f1ec773d1557b28ba6924f4020333143
treea0192a4...3ae136d555a269b8b685c77ecc730591copy hash to clipboard (tree)
parentfd53b7f...d1bd499d24fa48b43a79703355bde512copy hash to clipboard (diff)
merge-recursive.c