config/milestone.txt - Issue 29322687: Issue 2807 - MOBILE3901_2015070622_RELBRANCH merge conflicts

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: config/milestone.txt

Issue 29322687: Issue 2807 - MOBILE3901_2015070622_RELBRANCH merge conflicts (Closed)

Patch Set: Created July 20, 2015, 4:53 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

OLD	NEW
1 # Holds the current milestone.	1 # Holds the current milestone.

2 # Should be in the format of	2 # Should be in the format of

3 #	3 #

4 # x.x.x	4 # x.x.x

5 # x.x.x.x	5 # x.x.x.x

6 # x.x.x+	6 # x.x.x+

7 #	7 #

8 # Referenced by milestone.py.	8 # Referenced by milestone.py.

9 # Hopefully I'll be able to automate replacement of all	9 # Hopefully I'll be able to automate replacement of all

10 # hardcoded milestones in the tree from these two files.	10 # hardcoded milestones in the tree from these two files.

11 #--------------------------------------------------------	11 #--------------------------------------------------------

12	12

13 37.0.2	13 39.0.1

OLD	NEW