Junio C Hamano schrieb: > Johannes Sixt <j.sixt@xxxxxxxxxxxxx> writes: > >> After a merge conflict, 'git diff' shows a combined diff, which presents >> only the parts that conflicted or where there are near-by changes from >> different parents (potential conflicts). Is there a command line switch so >> that *all* changes are shown, even non-conflicting ones? > > Like "git diff HEAD"? No. Something that produces @@@ -23,5 -23,5 +23,7 @@@ A B ++<<<<<<< HEAD:foo +C ++======= + D ++>>>>>>> 97d7fee2cb068f215a593c6e5623b265db45d3bc:foo E F @@@ -50,4 -50,5 +53,5 @@@ G H +I J K @@@ -60,5 -61,4 +63,4 @@@ L M - N O P -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
