Interactive merge and resolve

Status	Owner	Importance	Complexity	MD Version
Completed	lluis	Normal	Medium	2.6

Interactive tool for merging and resolving conflicts.

Branching support

Status	Owner	Importance	Complexity	MD Version
Completed	lluis	Normal	Medium	2.6

GUI for branching/merging, browsing branches, etc.

Shelving

Status	Owner	Importance	Complexity	MD Version
Pending		Normal	Medium

Support for “shelving” a set of changes by diffing, and re-applying the shelved changes by patching. Store any number of shelved changesets. Simple but useful.

Use VCS diffs to prime text editor’s changed line markers

Status	Owner	Importance	Complexity	MD Version
Pending		Very-Low	Medium

When opening a text file in the text editor, use the VCS diff to initialize the “changed lines” markers to indicate which have been modified but not committed.