extended conflict command to show refspecs
Extended show command

When a feature is specified using its ID, the cat output is shown (an error was thrown before, since the feature type cannot be found out from the id)
simple paths are now supported. When a path is specified, it is assumed that it refers to the working tree.
Merge pull request #453 from volaya/show

Extended 'show' and 'conflict' commands