Hi Is there a query command which I can run on my workspace which will give output of following style. (in the same that of command git merge foo givesO I have examined git-lsfiles ; git log ; git-status didn't get output in following style Auto-merging nv/aaad/aaad_utils.c Auto-merging nv/aaad/include/aaad_session_private.h CONFLICT (content): Merge conflict in nv/aaad/include/aaad_session_private.h Auto-merging nv/aaad/test/session_authen_test.c CONFLICT (content): Merge conflict in nv/aaad/test/session_authen_test.c -- Thank you and best regards. Mahesh Vaidya / 9740500144 http://www.twitter.com/forvaidya -- 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