wishlist: add committer/timestamp info to conflict marker
Bug #318492 reported by
Jari Aalto
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Wishlist
|
Unassigned | ||
Bug Description
Traditional conflict marker:
<<<<<<< TREE
This
=======
That
>>>>>>> MERGE-SOURCE
SUGGESTION
By changing conflict markers to provide more information about who did the last change can improve contacting the right person is in doubt. Notice the last line with committer and timestamp information.
<<<<<<< TREE
This
=======
That
>>>>>>> MERGE-SOURCE; <email address hidden>; Sun 2009-01-18 18:37:54 +0200
| affects: | bazaar-mac-uninstaller → bzr |
| Changed in bzr: | |
| importance: | Undecided → Wishlist |
| status: | New → Confirmed |
| tags: | added: conflicts |
| tags: | added: check-for-breezy |
To post a comment you must log in.
